Index: install.php
===================================================================
--- install.php	(revision 4006)
+++ install.php	(working copy)
@@ -104,6 +104,14 @@
 <td><input name="weblog_title" type="text" id="weblog_title" size="25" /></td>
 </tr>
 <tr>
+<th><?php _e('Your username:'); ?></th>
+	<td><input name="admin_username" type="text" id="admin_username" size="25" /></td>
+</tr>
+<tr>
+<th><?php _e('Your password:'); ?></th>
+	<td><input name="admin_password" type="password" id="admin_password" size="25" /></td>
+</tr>
+<tr>
 <th><?php _e('Your e-mail:'); ?></th>
 	<td><input name="admin_email" type="text" id="admin_email" size="25" /></td>
 </tr>
@@ -120,8 +128,14 @@
 
 // Fill in the data we gathered
 $weblog_title = stripslashes($_POST['weblog_title']);
+$admin_username = stripslashes($_POST['admin_username']);
+$admin_password = stripslashes($_POST['admin_password']);
 $admin_email = stripslashes($_POST['admin_email']);
 // check e-mail address
+if (empty($admin_username)) {
+	die (__("<strong>ERROR</strong>: please type a username"));}
+if (empty($admin_password)) {
+	die (__("<strong>ERROR</strong>: please type a password"));}	
 if (empty($admin_email)) {
 	die (__("<strong>ERROR</strong>: please type your e-mail address"));
 } else if (!is_email($admin_email)) {
@@ -174,10 +188,9 @@
 $wp_rewrite->flush_rules();
 
 // Set up admin user
-$random_password = substr(md5(uniqid(microtime())), 0, 6);
 $display_name_array = explode('@', $admin_email);
 $display_name = $display_name_array[0];
-$wpdb->query("INSERT INTO $wpdb->users (ID, user_login, user_pass, user_email, user_registered, display_name, user_nicename) VALUES ( '1', 'admin', MD5('$random_password'), '$admin_email', NOW(), '$display_name', 'admin')");
+$wpdb->query("INSERT INTO $wpdb->users (ID, user_login, user_pass, user_email, user_registered, display_name, user_nicename) VALUES ( '1', '$admin_username', MD5('$admin_password'), '$admin_email', NOW(), '$display_name', '$admin_username')");
 $wpdb->query("INSERT INTO $wpdb->usermeta (user_id, meta_key, meta_value) VALUES ({$wpdb->insert_id}, '{$table_prefix}user_level', '10');");
 $admin_caps = serialize(array('administrator' => true));
 $wpdb->query("INSERT INTO $wpdb->usermeta (user_id, meta_key, meta_value) VALUES ({$wpdb->insert_id}, '{$table_prefix}capabilities', '{$admin_caps}');");
@@ -189,14 +202,14 @@
 
 You can log in to the administrator account with the following information:
 
-Username: admin
-Password: %2\$s
+Username: $admin_username
+Password: $admin_password
 
 We hope you enjoy your new weblog. Thanks!
 
 --The WordPress Team
 http://wordpress.org/
-"), $guessurl, $random_password);
+"), $guessurl, $admin_password);
 
 @wp_mail($admin_email, __('New WordPress Blog'), $message, $message_headers);
 
@@ -205,14 +218,14 @@
 
 <p><em><?php _e('Finished!'); ?></em></p>
 
-<p><?php printf(__('Now you can <a href="%1$s">log in</a> with the <strong>username</strong> "<code>admin</code>" and <strong>password</strong> "<code>%2$s</code>".'), '../wp-login.php', $random_password); ?></p>
-<p><?php _e('<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you. If you lose it, you will have to delete the tables from the database yourself, and re-install WordPress. So to review:'); ?>
+<p><?php printf(__('Now you can <a href="%1$s">log in</a> with the <strong>username</strong> "<code>'.$admin_username.'</code>" and <strong>password</strong> "<code>%2$s</code>".'), '../wp-login.php', $admin_password); ?></p>
+<p><?php _e('<strong><em>Note that password</em></strong> carefully! If you lose it, you will have to delete the tables from the database yourself, and re-install WordPress. So to review:'); ?>
 </p>
 <dl>
 <dt><?php _e('Username'); ?></dt>
-<dd><code>admin</code></dd>
+<dd><code><?php echo $admin_username; ?></code></dd>
 <dt><?php _e('Password'); ?></dt>
-<dd><code><?php echo $random_password; ?></code></dd>
+<dd><code><?php echo $admin_password; ?></code></dd>
 	<dt><?php _e('Login address'); ?></dt>
 <dd><a href="../wp-login.php">wp-login.php</a></dd>
 </dl>