--- MoinMoin/user.py	2004-12-28 16:49:57.049480900 -0500
+++ /home/geek/src/moin-1.3.1/build/lib/MoinMoin/user.py	2004-12-08 17:26:50.000000000 -0500
@@ -131,7 +131,7 @@
     @return: user name that can be used in acl lines
     """
     # Strip non alpha numeric characters, keep white space
-    name = ''.join([c for c in name if c.isalnum() or c.isspace() or c in '.@'])
+    name = ''.join([c for c in name if c.isalnum() or c.isspace()])
 
     # Normalize white space. Each name can contain multiple 
     # words separated with only one space.
@@ -283,12 +283,6 @@
         if not self.id and self.auth_username:
             self.id = getUserId(request, self.auth_username)
 
-        # Set this before the ID simply because we may have to auto-create
-        # the user.
-        from MoinMoin.i18n.meta import languages
-        if self.language and not languages.has_key(self.language):
-            self.language = 'en'
-
         if self.id:
             self.load_from_id()
             if self.name == self.auth_username:
@@ -301,10 +295,6 @@
             # use it reliably in edit locking
             from random import randint
             self.id = "%s.%d" % (str(time.time()), randint(0,65535))
-            if request.cfg.auto_account and request.cfg.auth_http_enabled:
-                self.trusted = 1
-                self.name = self.email = self.auth_username
-                self.save()
             
         # "may" so we can say "if user.may.read(pagename):"
         if self._cfg.SecurityPolicy:
@@ -313,6 +303,9 @@
             from security import Default
             self.may = Default(self)
         
+        from MoinMoin.i18n.meta import languages
+        if self.language and not languages.has_key(self.language):
+            self.language = 'en'
 
 
     def __filename(self):
--- MoinMoin/multiconfig.py	2004-12-28 16:28:30.578152600 -0500
+++ /home/geek/src/moin-1.3.1/build/lib/MoinMoin/multiconfig.py	2004-12-09 04:10:35.000000000 -0500
@@ -119,7 +119,6 @@
     allow_xslt = 0
     attachments = None # {'dir': path, 'url': url-prefix}
     auth_http_enabled = 0
-    auto_account = 0
     bang_meta = 0
     backtick_meta = 1
     caching_formats = ['text_html']
