--- user_orig.py	2006-07-01 20:56:00.000000000 +0200
+++ user.py	2006-11-25 16:38:42.000000000 +0100
@@ -936,7 +936,7 @@
             markup = '%s:%s' % (wikiname, pagename.replace(" ","_")) 
         return markup
 
-    def mailAccountData(self, cleartext_passwd=None):
+    def mailAccountData(self, cleartext_passwd=None, invitation=False):
         from MoinMoin.util import mail
         from MoinMoin.wikiutil import getSysPage
         _ = self._request.getText
@@ -955,7 +955,9 @@
             self.enc_password = pwd
             self.save()
 
-        text = '\n' + _("""\
+        if not invitation:
+
+            text = '\n' + _("""\
 Login Name: %s
 
 Login Password: %s
@@ -964,7 +966,7 @@
 """, formatted=False) % (
                         self.name, self.enc_password, self._request.getBaseURL(), getSysPage(self._request, 'UserPreferences').page_name)
 
-        text = _("""\
+            text = _("""\
 Somebody has requested to submit your account data to this email address.
 
 If you lost your password, please use the data below and just enter the
@@ -974,6 +976,32 @@
 After successfully logging in, it is of course a good idea to set a new and known password.
 """, formatted=False) + text
 
+        else:
+
+            text = '\n' + _("""\
+Login Name: %s
+
+Login Password: %s
+
+Login URL: %s/%s?action=login
+""", formatted=False) % (
+                        self.name, cleartext_passwd, self._request.getBaseURL(), getSysPage(self._request, 'UserPreferences').page_name)
+
+            text = _("""\
+Welcome to the %(sitename)s Wiki!
+
+You are invited to join our wiki community and share your ideas with us.
+Please use the login name and password below to log in. To ease login, you can
+also use copy and paste.
+Please do also make sure that in your browser's settings cookies are enabled
+for the login url so that authentications does really work and is kept while
+navigating in the wiki.
+
+After successfully logging in, it is of course a good idea to set a new password
+of your choice.
+""", formatted=False) % {'sitename': self._cfg.sitename or "Wiki"}  + text
+
+        
 
         subject = _('[%(sitename)s] Your wiki account data',
                     formatted=False) % {'sitename': self._cfg.sitename or "Wiki"}