--- a/MoinMoin/user.py	Sun Jul 27 17:40:11 2008 +0200
+++ b/MoinMoin/user.py	Mon Jul 28 12:04:00 2008 +0200
@@ -157,7 +157,7 @@
     hash = sha.new(pwd)
     hash.update(salt)
 
-    return '{SSHA}' + base64.b64encode(hash.digest() + salt).rstrip()
+    return '{SSHA}' + base64.encodestring(hash.digest() + salt).rstrip()
 
 
 def normalizeName(name):
@@ -316,7 +316,7 @@
         self.tz_offset = int(float(self._cfg.tz_offset) * 3600)
         self.language = ""
         self.real_language = "" # In case user uses "Browser setting". For language-statistics
-        self._loaded = False
+        self._stored = False
         self.date_fmt = ""
         self.datetime_fmt = ""
         self.quicklinks = self._cfg.quicklinks_default
@@ -483,8 +483,9 @@
         if not self.disabled:
             self.valid = 1
 
-        # Mark this user as loaded from disk, so UserCreatedEvent is not sent
-        self._loaded = True
+        # Mark this user as stored so saves don't send
+        # the "user created" event
+        self._stored = True
 
         # If user data has been changed, save fixed user data.
         if changed:
@@ -589,7 +590,8 @@
         if not self.disabled:
             self.valid = 1
 
-        if not self._loaded:
+        if not self._stored:
+            self._stored = True
             event = events.UserCreatedEvent(self._request, self)
             events.send_event(event)