Index: locker/deploy/bin/advancedbook
===================================================================
--- locker/deploy/bin/advancedbook	(revision 475)
+++ locker/deploy/bin/advancedbook	(revision 476)
@@ -15,5 +15,5 @@
 $a =~ s/dbpass/$sqlpass/g;
 $a =~ s/guestbookdb/$sqldb/g;
-$a =~ s/useremail/$human\@mit.edu/g;
+$a =~ s/useremail/$email/g;
 open(FILE, ">admin/config.inc.php");
 print FILE $a;
Index: locker/deploy/bin/e107
===================================================================
--- locker/deploy/bin/e107	(revision 475)
+++ locker/deploy/bin/e107	(revision 476)
@@ -29,5 +29,5 @@
      pass1 => $admin_password,
      pass2 => $admin_password,
-     email => "$human\@mit.edu",
+     email => $email,
      stage => 6,
      previous_steps => $prevb}) =~ /name='previous_steps' value='(.*)'/;
Index: locker/deploy/bin/gallery2
===================================================================
--- locker/deploy/bin/gallery2	(revision 475)
+++ locker/deploy/bin/gallery2	(revision 476)
@@ -49,5 +49,5 @@
 	   action => 'create',
 	   passwordB => $admin_password,
-	   email => "$human\@mit.edu",
+	   email => $email,
 	   fullName => $USER});
 fetch_uri('install/index.php', {step => 7}, {});
Index: locker/deploy/bin/joomla
===================================================================
--- locker/deploy/bin/joomla	(revision 475)
+++ locker/deploy/bin/joomla	(revision 476)
@@ -35,5 +35,5 @@
      siteUrl => $base_uri,
      absolutePath => getcwd(),
-     adminEmail => "$human\@mit.edu",
+     adminEmail => $email,
      adminPassword => $admin_password,
      filePerms => 0,
Index: locker/deploy/bin/mediawiki
===================================================================
--- locker/deploy/bin/mediawiki	(revision 475)
+++ locker/deploy/bin/mediawiki	(revision 476)
@@ -18,5 +18,5 @@
     {},
     {Sitename => $title,
-     EmergencyContact => "$USER\@mit.edu",
+     EmergencyContact => $email,
      LanguageCode => 'en',
      DBserver => $sqlhost,
@@ -25,5 +25,5 @@
      DBpassword => $sqlpass,
      DBpassword2 => $sqlpass,
-     defaultEmail => "$USER\@mit.edu",
+     defaultEmail => $email,
      SysopName => $admin_username,
      SysopPass => $admin_password,
Index: locker/deploy/bin/onserver.pm
===================================================================
--- locker/deploy/bin/onserver.pm	(revision 475)
+++ locker/deploy/bin/onserver.pm	(revision 476)
@@ -11,9 +11,9 @@
 use URI;
 our @ISA = qw(Exporter);
-our @EXPORT = qw(setup totmp fetch_uri print_login_info press_enter $server $tmp $USER $HOME $sname $deploy $addrend $base_uri $ua $admin_username $requires_sql $addrlast $sqlhost $sqluser $sqlpass $sqldb $sqldbcurl $admin_password $scriptsdev $human);
+our @EXPORT = qw(setup totmp fetch_uri print_login_info press_enter $server $tmp $USER $HOME $sname $deploy $addrend $base_uri $ua $admin_username $requires_sql $addrlast $sqlhost $sqluser $sqlpass $sqldb $admin_password $scriptsdev $human $email);
 
 our $server = "scripts.mit.edu";
 
-our ($tmp, $USER, $HOME, $sname, $deploy, $addrend, $base_uri, $ua, $admin_username, $requires_sql, $addrlast, $sqlhost, $sqluser, $sqlpass, $sqldb, $sqldbcurl, $admin_password, $scriptsdev, $human);
+our ($tmp, $USER, $HOME, $sname, $deploy, $addrend, $base_uri, $ua, $admin_username, $requires_sql, $addrlast, $sqlhost, $sqluser, $sqlpass, $sqldb, $admin_password, $scriptsdev, $human, $email);
 
 $tmp = ".scripts-tmp";
@@ -80,4 +80,5 @@
   ($sname, $deploy, $addrend, $admin_username, $requires_sql, $scriptsdev, $human) = @ARGV;
   chdir "$HOME/web_scripts/$addrend";
+  $email = "$human\@mit.edu";
   
   if($addrend =~ /^(.*)\/$/) {
@@ -111,6 +112,4 @@
       exit 1;
     }
-    $sqldbcurl = $sqldb;
-    $sqldbcurl =~ s/\+/\%2B/;
   }
  
Index: locker/deploy/bin/phpbb
===================================================================
--- locker/deploy/bin/phpbb	(revision 475)
+++ locker/deploy/bin/phpbb	(revision 476)
@@ -18,5 +18,5 @@
      dbpasswd => $sqlpass,
      prefix => '',
-     board_email => "$human\@mit.edu",
+     board_email => $email,
      server_name => $server,
      server_port => 80,
Index: locker/deploy/bin/wordpress
===================================================================
--- locker/deploy/bin/wordpress	(revision 475)
+++ locker/deploy/bin/wordpress	(revision 476)
@@ -21,5 +21,5 @@
     {step => 2},
     {weblog_title => 'My Blog',
-     admin_email => "$human\@mit.edu",
+     admin_email => $email,
      submit => 'Continue',
      step => 2});