--- _svn_Dakar/DEVELOP/lib/TWiki.pm	2005-10-23 23:44:19.000000000 +0200
+++ Dakar/lib/TWiki.pm	2005-10-27 22:13:50.000000000 +0200
@@ -299,4 +299,5 @@
     }
     $constantTags{ALLOWLOGINNAME}  = $TWiki::cfg{Register}{AllowLoginName};
+    $constantTags{PASSWORDMANAGER} = $TWiki::cfg{PasswordManager};
 
     # locale setup
--- _svn_Dakar/DEVELOP/data/TWiki/TWikiRegistration.txt	2005-10-27 20:19:19.000000000 +0200
+++ Dakar/data/TWiki/TWikiRegistration.txt	2005-10-28 02:07:14.000000000 +0200
@@ -46,12 +46,10 @@
   <td align="right"> %MAKETEXT{"Email address:"}% </td>
   <td><input type="text" name="Twk1Email" size="40" value="" /> =<font color="red">**</font>= </td>
-</tr><tr>
-  <td align="right"> %MAKETEXT{"Your password:"}% </td>
-  <td><input type="password" name="Twk1Password" size="40" value="" /> =<font color="red">**</font>= </td>
-</tr><tr>
-  <td align="right"> %MAKETEXT{"Retype password:"}% </td>
-  <td><input type="password" name="Twk1Confirm" size="40" value="" /> =<font color="red">**</font>= </td>
 </tr>
-<tr>
+<!--
+   # only ask for a password if we have a password manager in place
+   * Set ASK_FOR_PASSWORD = <tr><td align='right'> %MAKETEXT{"Your password:"}% </td><td><input type='password' name='Twk1Password' size='40' value='' /> =<font color='red'>**</font>= </td></tr><tr><td align='right'> %MAKETEXT{"Retype password:"}% </td><td><input type='password' name='Twk1Confirm' size='40' value='' /> =<font color='red'>**</font>= </td></tr>
+-->
+%IF{"$ PASSWORDMANAGER = 'none'" then="" else="%ASK_FOR_PASSWORD%"}%<tr>
   <td align="right"> %MAKETEXT{"Company name:"}% </td>
   <td><input type="text" name="Twk0CompanyName" size="40" value="" /></td>
--- _svn_Dakar/DEVELOP/lib/TWiki/UI/Register.pm	2005-10-18 00:10:50.000000000 +0200
+++ Dakar/lib/TWiki/UI/Register.pm	2005-10-28 03:56:07.000000000 +0200
@@ -791,8 +791,17 @@
     ASSERT($data->{WikiName}) if DEBUG;
 
+    # The user homepage needs not be write protected if TWiki does no
+    # password management.  In that case we'll disable the ALLOWTOPICCHANGE
+    # setting when copying the user template to the actual home page.
+    my $writeableUserHomepage = $TWiki::cfg{PasswordManager} eq 'none' ? '#' : '';
+
     # TODO - there should be some way of overwriting meta without
     # blatting the content.
 
-    $text ||= "%SPLIT%\n\t* %KEY%: %VALUE%%SPLIT%\n\t* Set ALLOWTOPICCHANGE = %WIKIUSERNAME%\n";
+    $text ||= ( "%SPLIT%\n"
+	      . "   * %KEY%: %VALUE%%SPLIT%\n"
+              . "   * ${writeableUserHomepage}Set ALLOWTOPICCHANGE = %WIKIUSERNAME%\n"
+	      );
+    $text  =~  s/%WRITEABLEUSERHOMEPAGE%/$writeableUserHomepage/g;
     my ( $before, $repeat, $after ) = split( /%SPLIT%/, $text );
 
--- _svn_Dakar/DEVELOP/data/TWiki/NewUserTemplate.txt	2005-10-18 00:12:48.000000000 +0200
+++ Dakar/data/TWiki/NewUserTemplate.txt	2005-10-28 03:38:23.000000000 +0200
@@ -20,5 +20,5 @@
       * Set EDITBOXSTYLE = width: 99%
    * %MAKETEXT{"Write protect your home page: (set it to your [_1])" args="%MAINWEB%.WikiName"}%
-      * Set ALLOWTOPICCHANGE = %WIKIUSERNAME%
+      * %WRITEABLEUSERHOMEPAGE%Set ALLOWTOPICCHANGE = %WIKIUSERNAME%
 
 __%MAKETEXT{"Related Topics:"}%__