Index: openacs-4/packages/acs-bootstrap-installer/installer.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-bootstrap-installer/installer.tcl	18 Jul 2003 11:36:34 -0000	1.8
+++ openacs-4/packages/acs-bootstrap-installer/installer.tcl	25 Aug 2003 11:55:40 -0000	1.9
@@ -177,7 +177,9 @@
     # Peter Marklund
     # We need to be able to invoke ad_conn in the installer. However
     # We cannot use the rp_filter that sets up ad_conn
-    proc ad_conn {attribute} {
+    proc ad_conn { args } {
+        set attribute [lindex $args 0]
+
         if { [string equal $attribute "-connected_p"] } {
             set return_value 1
         } elseif { [catch {set return_value [ns_conn $attribute] } error] } {
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.6 -r1.7
--- openacs-4/packages/acs-bootstrap-installer/installer/create-administrator-2.tcl	22 Aug 2003 15:09:36 -0000	1.6
+++ openacs-4/packages/acs-bootstrap-installer/installer/create-administrator-2.tcl	25 Aug 2003 11:55:40 -0000	1.7
@@ -7,13 +7,16 @@
 
 } {
     email:notnull
-    username:notnull
+    {username ""}
     first_names:notnull
     last_name:notnull
     password:notnull
     password_confirmation:notnull
 }
 
+if { [empty_string_p $username] } {
+    set username $email
+}
 
 if { [string compare $password $password_confirmation] } {
     install_return 200 "Passwords Don't Match" "