Index: openacs-4/packages/acs-bootstrap-installer/installer/create-administrator-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer/Attic/create-administrator-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-bootstrap-installer/installer/create-administrator-2.tcl	30 Nov 2002 17:14:05 -0000	1.5
+++ openacs-4/packages/acs-bootstrap-installer/installer/create-administrator-2.tcl	22 Aug 2003 15:09:36 -0000	1.6
@@ -7,14 +7,14 @@
 
 } {
     email:notnull
+    username:notnull
     first_names:notnull
     last_name:notnull
     password:notnull
     password_confirmation:notnull
-    password_question:notnull
-    password_answer:notnull
 }
 
+
 if { [string compare $password $password_confirmation] } {
     install_return 200 "Passwords Don't Match" "
 The passwords you've entered don't match. Please <a href=\"javascript:history.back()\">try again</a>.
@@ -28,7 +28,18 @@
 
   db_transaction {
     
-    set user_id [ad_user_new $email $first_names $last_name $password $password_question $password_answer]
+    set user_id [ad_user_new \
+                     $email \
+                     $first_names \
+                     $last_name \
+                     $password \
+                     "" \
+                     "" \
+                     "" \
+                     "t" \
+                     "approved" \
+                     "" \
+                     $username]
     if { !$user_id } {
 
 	global errorInfo    
Index: openacs-4/packages/acs-bootstrap-installer/installer/create-administrator.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer/Attic/create-administrator.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-bootstrap-installer/installer/create-administrator.tcl	12 Apr 2001 16:58:18 -0000	1.1
+++ openacs-4/packages/acs-bootstrap-installer/installer/create-administrator.tcl	22 Aug 2003 15:09:36 -0000	1.2
@@ -38,14 +38,18 @@
 user in UNIX). Please type in the email address, first and last name, and password
 for this user.
 
-<form action=create-administrator-2>
+<form action=\"create-administrator-2\">
 <blockquote>
 <table>
 <tr>
   <th align=right>Email:</th>
   <td><input name=email size=20></td>
 </tr>
 <tr>
+  <th align=right>Username:</th>
+  <td><input name=username size=20></td>
+</tr>
+<tr>
   <th align=right>First Name:</th>
   <td><input name=first_names size=20></td>
 </tr>
@@ -61,21 +65,6 @@
   <th align=right>Password (again):</th>
   <td><input type=password name=password_confirmation size=12></td>
 </tr>
-<tr valign=baseline>
-  <th align=right>Password Question:</th>
-  <td><select name=password_question>
-<option>What is your mother's maiden name?
-<option>Is it better to be loved or feared?
-<option>How much wood could a woodchuck chuck?
-<option>Hello - is there anybody out there?
-<option>Hvad skal vi have til frokost?
-</select><br>(To be asked if you forget your password.)
-</td>
-</tr>
-<tr>
-  <th align=right>Password Answer:</th>
-  <td><input name=password_answer size=30></td>
-</tr>
 
 <tr><td colspan=2 align=center><br><input type=submit value=\"Create User ->\"></td></tr>
 </form>