Index: wp-admin/setup-config.php
===================================================================
--- wp-admin/setup-config.php	(revision 6637)
+++ wp-admin/setup-config.php	(working copy)
@@ -177,19 +177,16 @@
 				fwrite($handle, str_replace("putyourdbnamehere", $dbname, $line));
 				break;
 			case "define('DB_USER'":
-				fwrite($handle, str_replace("'usernamehere'", "'$uname'", $line));
+				fwrite($handle, str_replace("usernamehere", $uname, $line));
 				break;
 			case "define('DB_PASSW":
-				fwrite($handle, str_replace("'yourpasswordhere'", "'$passwrd'", $line));
+				fwrite($handle, str_replace("yourpasswordhere", $passwrd, $line));
 				break;
 			case "define('DB_HOST'":
 				fwrite($handle, str_replace("localhost", $dbhost, $line));
 				break;
 			case '$table_prefix  =':
 				fwrite($handle, str_replace('wp_', $prefix, $line));
-				break;
-			default:
-				fwrite($handle, $line);
 		}
 	}
 	fclose($handle);