Index: wp-admin/wp-admin.css
===================================================================
--- wp-admin/wp-admin.css	(revision 4182)
+++ wp-admin/wp-admin.css	(working copy)
@@ -558,11 +558,10 @@
 
 #login {
 	position: relative;
-	background: url('images/login-bkg-tile.gif') no-repeat top center #fbfbfb;
+	background: url('images/login-bkg-tile.gif') no-repeat top center;
 	color: #fff;
-	/* height: 430px; */
 	margin: 5em auto;
-	padding: 45px 50px 0;
+	padding: 20px 50px 0;
 	width: 325px;
 }
 
@@ -576,6 +575,11 @@
 	text-align: center;
 }
 
+#login #login_error a {
+	color: #ebcd4e;
+	border-color: #ebcd4e;
+}
+
 #login #send {
 	color: #fff;
 	text-align: left;
@@ -583,20 +587,28 @@
 	font-size: 1.1em;
 }
 
-#login h1 {
+#login h1 a {
 	margin: 0 auto;
-	padding-bottom: 10px;
-	left: 137px;
-	height: 75px;
-	width: 75px;
-}
-
-#login h1 a {
+	height: 88px;
+	width: 320px;
 	display: block;
-	text-indent: -9999px;
+	/*text-indent: -9999px;*/
 	border-bottom: none;
 }
 
+#login .hide {
+	display: none;
+}
+
+#login .message {
+	font-size: 10pt;
+	text-align: center;
+}
+
+#login .register {
+	font-size: 20px;
+}
+
 #login input {
 	padding: 4px;
 }
@@ -605,21 +617,21 @@
 	background: url('images/login-bkg-bottom.gif') no-repeat bottom center;
 	list-style: none;
 	margin: 0 -50px;
-	padding: 0 50px 5px;
+	padding: 10px 50px 25px;
 }
 
 #login ul:after {
-  content: "."; 
-  display: block; 
-  height: 0; 
-  clear: both; 
-  visibility: hidden;
+	content: "."; 
+	display: block; 
+	height: 0; 
+	clear: both; 
+	visibility: hidden;
 }
 
 #login ul li {
 	float: left;
-	font-size: 11px;
-	padding: 15px 0;
+	font-size: 12px;
+	padding: 5px 0;
 	text-align: center;
 }
 
@@ -638,7 +650,7 @@
 	color: #fff;
 }
 
-#login #log, #pwd, #user_login, #email {
+#login .input {
 	font-size: 1.8em;
 	margin-top: 3px;
 	width: 97%;
@@ -650,9 +662,14 @@
 
 #login #submit {
 	margin: 0;
-	font-size: 1.2em;
+	font-size: 15px;
 }
 
+#login .fullwidth {
+	width: 320px;
+}
+
+
 #postcustom .updatemeta, #postcustom .deletemeta {
 	margin: auto;
 }
Index: wp-includes/general-template.php
===================================================================
--- wp-includes/general-template.php	(revision 4182)
+++ wp-includes/general-template.php	(working copy)
@@ -40,7 +40,7 @@
 
 	if ( ! is_user_logged_in() ) {
 		if ( get_option('users_can_register') )
-			$link = $before . '<a href="' . get_option('siteurl') . '/wp-register.php">' . __('Register') . '</a>' . $after;
+			$link = $before . '<a href="' . get_option('siteurl') . '/wp-login.php?action=register">' . __('Register') . '</a>' . $after;
 		else
 			$link = '';
 	} else {
Index: wp-includes/pluggable.php
===================================================================
--- wp-includes/pluggable.php	(revision 4182)
+++ wp-includes/pluggable.php	(working copy)
@@ -178,7 +178,7 @@
 		return false;
 
 	if ( '' == $password ) {
-		$error = __('<strong>Error</strong>: The password field is empty.');
+		$error = __('<strong>ERROR</strong>: The password field is empty.');
 		return false;
 	}
 
@@ -186,7 +186,7 @@
 	//$login = $wpdb->get_row("SELECT ID, user_login, user_pass FROM $wpdb->users WHERE user_login = '$username'");
 
 	if (!$login) {
-		$error = __('<strong>Error</strong>: Wrong username.');
+		$error = __('<strong>ERROR</strong>: Invalid username.');
 		return false;
 	} else {
 		// If the password is already_md5, it has been double hashed.
@@ -194,7 +194,7 @@
 		if ( ($already_md5 && md5($login->user_pass) == $password) || ($login->user_login == $username && $login->user_pass == md5($password)) ) {
 			return true;
 		} else {
-			$error = __('<strong>Error</strong>: Incorrect password.');
+			$error = __('<strong>ERROR</strong>: Incorrect password.');
 			$pwd = '';
 			return false;
 		}
Index: wp-login.php
===================================================================
--- wp-login.php	(revision 4182)
+++ wp-login.php	(working copy)
@@ -2,7 +2,7 @@
 require( dirname(__FILE__) . '/wp-config.php' );
 
 $action = $_REQUEST['action'];
-$error = '';
+$errors = array();
 
 if ( isset($_GET['key']) )
 	$action = 'resetpass';
@@ -20,16 +20,61 @@
 		update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) );
 }
 
-switch($action) {
 
-case 'logout':
+// Rather than duplicating this HTML all over the place, we'll stick it in function
+function login_header($title = 'Login', $message = '') {
+	global $errors, $error;
 
+	?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title><?php bloginfo('name'); ?> &rsaquo; <?php echo $title; ?></title>
+	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
+	<link rel="stylesheet" href="<?php bloginfo('wpurl'); ?>/wp-admin/wp-admin.css" type="text/css" />
+	<!--[if IE]><style type="text/css">#login h1 a { margin-top: 35px; } #login ul { padding-bottom: 65px; }</style><![endif]--><!-- Curse you, IE! -->
+	<script type="text/javascript">
+		function focusit() {
+			document.getElementById('user_login').focus();
+		}
+		window.onload = focusit;
+	</script>
+<?php do_action('login_head'); ?>
+</head>
+<body>
+
+<div id="login">
+<h1><a href="<?php echo apply_filters('login_headerurl', 'http://wordpress.org/'); ?>" title="<?php echo apply_filters('login_headertitle', __('Powered by WordPress')); ?>"><span class="hide"><?php bloginfo('name'); ?></span></a></h1>
+<?php
+	if ( !empty( $message ) ) echo apply_filters('login_message', $message) . "\n";
+
+	// Incase a plugin uses $error rather than the $errors array
+	if ( !empty( $error ) ) {
+		$errors['error'] = $error;
+		unset($error);
+	}
+
+	if ( !empty( $errors ) ) {
+		if ( is_array( $errors ) ) {
+			$newerrors = "\n";
+			foreach ( $errors as $error ) $newerrors .= '	' . $error . "<br />\n";
+			$errors = $newerrors;
+		}
+
+		echo '<div id="login_error">' . apply_filters('login_errors', $errors) . "</div>\n";
+	}
+} // End of login_header()
+
+
+switch ($action) {
+
+case 'logout' :
+
 	wp_clearcookie();
 	do_action('wp_logout');
-	nocache_headers();
 
-	$redirect_to = 'wp-login.php';
-	if ( isset($_REQUEST['redirect_to']) )
+	$redirect_to = 'wp-login.php?loggedout=true';
+	if ( isset( $_REQUEST['redirect_to'] ) )
 		$redirect_to = $_REQUEST['redirect_to'];
 
 	wp_redirect($redirect_to);
@@ -37,53 +82,78 @@
 
 break;
 
-case 'lostpassword':
-do_action('lost_password');
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>WordPress &raquo; <?php _e('Lost Password') ?></title>
-	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
-	<link rel="stylesheet" href="<?php echo get_option('siteurl'); ?>/wp-admin/wp-admin.css" type="text/css" />
-	<script type="text/javascript">
-	function focusit() {
-		// focus on first input field
-		document.getElementById('user_login').focus();
+case 'lostpassword' :
+case 'retrievepassword' :
+	$user_login = '';
+	$user_pass = '';
+
+	if ( $_POST ) {
+		if ( empty( $_POST['user_login'] ) )
+			$errors['user_login'] = __('<strong>ERROR</strong>: The username field is empty.');
+		if ( empty( $_POST['user_email'] ) )
+			$errors['user_email'] = __('<strong>ERROR</strong>: The e-mail field is empty.');
+
+		do_action('lostpassword_post');
+		
+		if ( empty( $errors ) ) {
+			$user_data = get_userdatabylogin(trim($_POST['user_login']));
+			// redefining user_login ensures we return the right case in the email
+			$user_login = $user_data->user_login;
+			$user_email = $user_data->user_email;
+
+			if (!$user_email || $user_email != $_POST['user_email']) {
+				$errors['invalidcombo'] = __('<strong>ERROR</strong>: Invalid username / e-mail combination.');
+			} else {
+				do_action('retreive_password', $user_login);  // Misspelled and deprecated
+				do_action('retrieve_password', $user_login);
+
+				// Generate something random for a password... md5'ing current time with a rand salt
+				$key = substr( md5( uniqid( microtime() ) ), 0, 8);
+				// Now insert the new pass md5'd into the db
+				$wpdb->query("UPDATE $wpdb->users SET user_activation_key = '$key' WHERE user_login = '$user_login'");
+				$message = __('Someone has asked to reset the password for the following site and username.') . "\r\n\r\n";
+				$message .= get_option('siteurl') . "\r\n\r\n";
+				$message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
+				$message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n";
+				$message .= get_option('siteurl') . "/wp-login.php?action=rp&key=$key\r\n";
+
+				if (FALSE == wp_mail($user_email, sprintf(__('[%s] Password Reset'), get_option('blogname')), $message)) {
+					die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>');
+				} else {
+					wp_redirect('wp-login.php?checkemail=confirm');
+					exit();
+				}
+			}
+		}
 	}
-	window.onload = focusit;
-	</script>
-	<style type="text/css">
-	#user_login, #email, #submit {
-		font-size: 1.7em;
-	}
-	</style>
-</head>
-<body>
-<div id="login">
-<h1><a href="http://wordpress.org/">WordPress</a></h1>
-<p><?php _e('Please enter your information here. We will send you a new password.') ?></p>
-<?php
-if ($error)
-	echo "<div id='login_error'>$error</div>";
+
+	if ( 'invalidkey' == $_GET['error'] ) $errors['invalidkey'] = __('Sorry, that key does not appear to be valid.');
+
+	do_action('lost_password');
+	login_header(__('Lost Password'), '<p class="message">' . __('Please enter your username and e-mail address. You will recieve a new password via e-mail.') . '</p>');
 ?>
 
-<form name="lostpass" action="wp-login.php" method="post" id="lostpass">
-<p>
-<input type="hidden" name="action" value="retrievepassword" />
-<label><?php _e('Username:') ?><br />
-<input type="text" name="user_login" id="user_login" value="" size="20" tabindex="1" /></label></p>
-<p><label><?php _e('E-mail:') ?><br />
-<input type="text" name="email" id="email" value="" size="25" tabindex="2" /></label><br />
-</p>
-<p class="submit"><input type="submit" name="submit" id="submit" value="<?php _e('Retrieve Password &raquo;'); ?>" tabindex="3" /></p>
+<form name="lostpasswordform" id="lostpasswordform" action="wp-login.php?action=lostpassword" method="post">
+	<p>
+		<label><?php _e('Username:') ?><br />
+		<input type="text" name="user_login" id="user_login" class="input" value="<?php echo wp_specialchars(stripslashes($_POST['user_login']), 1); ?>" size="20" tabindex="10" /></label>
+	</p>
+	<p>
+		<label><?php _e('E-mail:') ?><br />
+		<input type="text" name="user_email" id="user_email" class="input" value="<?php echo wp_specialchars(stripslashes($_POST['user_email']), 1); ?>" size="25" tabindex="20" /></label>
+	</p>
+<?php do_action('lostpassword_form'); ?>
+	<p class="submit"><input type="submit" name="submit" id="submit" value="<?php _e('Get New Password &raquo;'); ?>" tabindex="100" /></p>
 </form>
 <ul>
+<?php if (get_option('users_can_register')) : ?>
+	<li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Login') ?></a></li>
+	<li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=register"><?php _e('Register') ?></a></li>
+	<li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>" class="fullwidth">&laquo; <?php _e('Back to blog') ?></a></li>
+<?php else : ?>
 	<li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>">&laquo; <?php _e('Back to blog') ?></a></li>
-<?php if (get_option('users_can_register')) : ?>
-	<li><a href="<?php bloginfo('wpurl'); ?>/wp-register.php"><?php _e('Register') ?></a></li>
+	<li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Login') ?></a></li>
 <?php endif; ?>
-	<li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Login') ?></a></li>
 </ul>
 </div>
 </body>
@@ -91,93 +161,132 @@
 <?php
 break;
 
-case 'retrievepassword':
-	$user_data = get_userdatabylogin(trim($_POST['user_login']));
-	// redefining user_login ensures we return the right case in the email
-	$user_login = $user_data->user_login;
-	$user_email = $user_data->user_email;
-
-	if (!$user_email || $user_email != $_POST['email'])
-		wp_die(sprintf(__('Sorry, that user does not seem to exist in our database. Perhaps you have the wrong username or e-mail address? <a href="%s">Try again</a>.'), 'wp-login.php?action=lostpassword'));
-
-do_action('retreive_password', $user_login);  // Misspelled and deprecated.
-do_action('retrieve_password', $user_login);
-
-	// Generate something random for a password... md5'ing current time with a rand salt
-	$key = substr( md5( uniqid( microtime() ) ), 0, 8);
-	// now insert the new pass md5'd into the db
- 	$wpdb->query("UPDATE $wpdb->users SET user_activation_key = '$key' WHERE user_login = '$user_login'");
-	$message = __('Someone has asked to reset the password for the following site and username.') . "\r\n\r\n";
-	$message .= get_option('siteurl') . "\r\n\r\n";
-	$message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
-	$message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n";
-	$message .= get_option('siteurl') . "/wp-login.php?action=rp&key=$key\r\n";
-
-	$m = wp_mail($user_email, sprintf(__('[%s] Password Reset'), get_option('blogname')), $message);
-
-	if ($m == false) {
-		 echo '<p>' . __('The e-mail could not be sent.') . "<br />\n";
-         echo  __('Possible reason: your host may have disabled the mail() function...') . "</p>";
-		die();
-	} else {
-		echo '<p>' .  sprintf(__("The e-mail was sent successfully to %s's e-mail address."), $user_login) . '<br />';
-		echo  "<a href='wp-login.php' title='" . __('Check your e-mail first, of course') . "'>" . __('Click here to login!') . '</a></p>';
-		die();
-	}
-
-break;
-
 case 'resetpass' :
 case 'rp' :
-	// Generate something random for a password... md5'ing current time with a rand salt
 	$key = preg_replace('/a-z0-9/i', '', $_GET['key']);
-	if ( empty($key) )
-		wp_die( __('Sorry, that key does not appear to be valid.') );
+	if ( empty( $key ) ) {
+		wp_redirect('wp-login.php?action=lostpassword&error=invalidkey');
+		exit();
+	}
+
 	$user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE user_activation_key = '$key'");
-	if ( !$user )
-		wp_die( __('Sorry, that key does not appear to be valid.') );
+	if ( empty( $user ) ) {
+		wp_redirect('wp-login.php?action=lostpassword&error=invalidkey');
+		exit();
+	}
 
 	do_action('password_reset');
 
+	// Generate something random for a password... md5'ing current time with a rand salt
 	$new_pass = substr( md5( uniqid( microtime() ) ), 0, 7);
- 	$wpdb->query("UPDATE $wpdb->users SET user_pass = MD5('$new_pass'), user_activation_key = '' WHERE user_login = '$user->user_login'");
+	$wpdb->query("UPDATE $wpdb->users SET user_pass = MD5('$new_pass'), user_activation_key = '' WHERE user_login = '$user->user_login'");
 	wp_cache_delete($user->ID, 'users');
 	wp_cache_delete($user->user_login, 'userlogins');
 	$message  = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
 	$message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";
 	$message .= get_option('siteurl') . "/wp-login.php\r\n";
 
-	$m = wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_option('blogname')), $message);
-
-	if ($m == false) {
-		echo '<p>' . __('The e-mail could not be sent.') . "<br />\n";
-		echo  __('Possible reason: your host may have disabled the mail() function...') . '</p>';
-		die();
+	if (FALSE == wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_option('blogname')), $message)) {
+		die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>');
 	} else {
-		echo '<p>' .  sprintf(__('Your new password is in the mail.'), $user_login) . '<br />';
-        echo  "<a href='wp-login.php' title='" . __('Check your e-mail first, of course') . "'>" . __('Click here to login!') . '</a></p>';
 		// send a copy of password change notification to the admin
 		$message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
 		wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), get_option('blogname')), $message);
-		die();
+
+		wp_redirect('wp-login.php?checkemail=newpass');
+		exit();
 	}
 break;
 
+case 'register' :
+	if ( FALSE == get_option('users_can_register') ) {
+		wp_redirect('wp-login.php?registration=disabled');
+		exit();
+	}
+
+	if ( $_POST ) {
+		require_once( ABSPATH . WPINC . '/registration.php');
+
+		$user_login = sanitize_user( $_POST['user_login'] );
+		$user_email = $_POST['user_email'];
+
+		// Check the username
+		if ( $user_login == '' )
+			$errors['user_login'] = __('<strong>ERROR</strong>: Please enter a username.');
+		elseif ( !validate_username( $user_login ) ) {
+			$errors['user_login'] = __('<strong>ERROR</strong>: This username is invalid.  Please enter a valid username.');
+			$user_login = '';
+		} elseif ( username_exists( $user_login ) )
+			$errors['user_login'] = __('<strong>ERROR</strong>: This username is already registered, please choose another one.');
+
+		// Check the e-mail address
+		if ($user_email == '') {
+			$errors['user_email'] = __('<strong>ERROR</strong>: Please type your e-mail address.');
+		} elseif ( !is_email( $user_email ) ) {
+			$errors['user_email'] = __('<strong>ERROR</strong>: The email address isn&#8217;t correct.');
+			$user_email = '';
+		} elseif ( email_exists( $user_email ) )
+			$errors['user_email'] = __('<strong>ERROR</strong>: This email is already registered, please choose another one.');
+
+		do_action('register_post');
+
+		if ( empty( $errors ) ) {
+			$user_pass = substr( md5( uniqid( microtime() ) ), 0, 7);
+
+			$user_id = wp_create_user( $user_login, $user_pass, $user_email );
+			if ( !$user_id )
+				$errors['registerfail'] = sprintf(__('<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href="mailto:%s">webmaster</a> !'), get_option('admin_email'));
+			else {
+				wp_new_user_notification($user_id, $user_pass);
+
+				wp_redirect('wp-login.php?checkemail=registered');
+				exit();
+			}
+		}
+	}
+
+	login_header(__('Registration Form'), '<p class="message register">' . __('Register For This Site') . '</p>');
+?>
+
+<form name="registerform" id="registerform" action="wp-login.php?action=register" method="post">
+	<p>
+		<label><?php _e('Username:') ?><br />
+		<input type="text" name="user_login" id="user_login" class="input" value="<?php echo wp_specialchars(stripslashes($user_login), 1); ?>" size="20" tabindex="10" /></label>
+	</p>
+	<p>
+		<label><?php _e('E-mail:') ?><br />
+		<input type="text" name="user_email" id="user_email" class="input" value="<?php echo wp_specialchars(stripslashes($user_email), 1); ?>" size="25" tabindex="20" /></label>
+	</p>
+<?php do_action('register_form'); ?>
+	<p id="reg_passmail"><?php _e('A password will be e-mailed to you.') ?></p>
+	<p class="submit"><input type="submit" name="submit" id="submit" value="<?php _e('Register &raquo;'); ?>" tabindex="100" /></p>
+</form>
+<ul>
+	<li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Login') ?></a></li>
+	<li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=lostpassword" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a></li>
+	<li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>" class="fullwidth">&laquo; <?php _e('Back to blog') ?></a></li>
+</ul>
+</div>
+</body>
+</html>
+<?php
+break;
+
 case 'login' : 
 default:
-
 	$user_login = '';
 	$user_pass = '';
-	$using_cookie = false;
+	$using_cookie = FALSE;
+
 	if ( !isset( $_REQUEST['redirect_to'] ) )
 		$redirect_to = 'wp-admin/';
 	else
 		$redirect_to = $_REQUEST['redirect_to'];
 
-	if( $_POST ) {
-		$user_login = $_POST['log'];
+	if ( $_POST ) {
+		$user_login = $_POST['user_login'];
 		$user_login = sanitize_user( $user_login );
-		$user_pass  = $_POST['pwd'];
+		$user_pass  = $_POST['user_pass'];
 		$rememberme = $_POST['rememberme'];
 	} else {
 		$cookie_login = wp_get_cookie_login();
@@ -190,7 +299,7 @@
 
 	do_action('wp_authenticate', array(&$user_login, &$user_pass));
 
-	if ( $user_login && $user_pass ) {
+	if ( $user_login && $user_pass && empty( $errors ) ) {
 		$user = new WP_User(0, $user_login);
 
 		// If the user can't edit posts, send them to their profile.
@@ -202,54 +311,53 @@
 				wp_setcookie($user_login, $user_pass, false, '', '', $rememberme);
 			do_action('wp_login', $user_login);
 			wp_redirect($redirect_to);
-			exit;
+			exit();
 		} else {
 			if ( $using_cookie )
-				$error = __('Your session has expired.');
+				$errors['expiredsession'] = __('Your session has expired.');
 		}
-	} else if ( $user_login || $user_pass ) {
-		$error = __('<strong>Error</strong>: The password field is empty.');
 	}
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>WordPress &rsaquo; <?php _e('Login') ?></title>
-	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
-	<link rel="stylesheet" href="<?php bloginfo('wpurl'); ?>/wp-admin/wp-admin.css" type="text/css" />
-	<script type="text/javascript">
-	function focusit() {
-		document.getElementById('log').focus();
-	}
-	window.onload = focusit;
-	</script>
-</head>
-<body>
+	
+	if ( $_POST && empty( $user_login ) )
+		$errors['user_login'] = __('<strong>ERROR</strong>: The username field is empty.');
+	if ( $_POST && empty( $user_pass ) )
+		$errors['user_pass'] = __('<strong>ERROR</strong>: The password field is empty.');
 
-<div id="login">
-<h1><a href="http://wordpress.org/">WordPress</a></h1>
-<?php
-if ( $error )
-	echo "<div id='login_error'>$error</div>";
+	// Some parts of this script use the main login form to display a message
+	if		( TRUE == $_GET['loggedout'] )			$errors['loggedout']		= __('Successfully logged you out.');
+	elseif	( 'disabled' == $_GET['registration'] )	$errors['registerdiabled']	= __('User registration is currently not allowed.');
+	elseif	( 'confirm' == $_GET['checkemail'] )	$errors['confirm']			= __('Check your e-mail for the confirmation link.');
+	elseif	( 'newpass' == $_GET['checkemail'] )	$errors['newpass']			= __('Check your e-mail for your new password.');
+	elseif	( 'registered' == $_GET['checkemail'] )	$errors['registered']		= __('Registration complete. Please check your e-mail.');
+
+	login_header(__('Login'));
 ?>
 
 <form name="loginform" id="loginform" action="wp-login.php" method="post">
-<p><label><?php _e('Username:') ?><br /><input type="text" name="log" id="log" value="<?php echo wp_specialchars(stripslashes($user_login), 1); ?>" size="20" tabindex="1" /></label></p>
-<p><label><?php _e('Password:') ?><br /> <input type="password" name="pwd" id="pwd" value="" size="20" tabindex="2" /></label></p>
-<p>
-  <label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="3" /> 
-  <?php _e('Remember me'); ?></label></p>
-<p class="submit">
-	<input type="submit" name="submit" id="submit" value="<?php _e('Login'); ?> &raquo;" tabindex="4" />
-	<input type="hidden" name="redirect_to" value="<?php echo wp_specialchars($redirect_to); ?>" />
-</p>
+	<p>
+		<label><?php _e('Username:') ?><br />
+		<input type="text" name="user_login" id="user_login" class="input" value="<?php echo wp_specialchars(stripslashes($user_login), 1); ?>" size="20" tabindex="10" /></label>
+	</p>
+	<p>
+		<label><?php _e('Password:') ?><br />
+		<input type="password" name="user_pass" id="user_pass" class="input" value="" size="20" tabindex="20" /></label>
+	</p>
+<?php do_action('login_form'); ?>
+	<p><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="90" /> <?php _e('Remember me'); ?></label></p>
+	<p class="submit">
+		<input type="submit" name="submit" id="submit" value="<?php _e('Login'); ?> &raquo;" tabindex="100" />
+		<input type="hidden" name="redirect_to" value="<?php echo wp_specialchars($redirect_to); ?>" />
+	</p>
 </form>
 <ul>
+<?php if (get_option('users_can_register')) : ?>
+	<li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=register"><?php _e('Register') ?></a></li>
+	<li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=lostpassword" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a></li>
+	<li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>" class="fullwidth">&laquo; <?php _e('Back to blog') ?></a></li>
+<?php else : ?>
 	<li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>">&laquo; <?php _e('Back to blog') ?></a></li>
-<?php if (get_option('users_can_register')) : ?>
-	<li><a href="<?php bloginfo('wpurl'); ?>/wp-register.php"><?php _e('Register') ?></a></li>
+	<li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=lostpassword" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a></li>
 <?php endif; ?>
-	<li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=lostpassword" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a></li>
 </ul>
 </div>
 
@@ -259,4 +367,4 @@
 
 break;
 } // end action switch
-?>
+?>
\ No newline at end of file
Index: wp-register.php
===================================================================
--- wp-register.php	(revision 4182)
+++ wp-register.php	(working copy)
@@ -1,159 +1,10 @@
 <?php
-require('./wp-config.php');
-require_once( ABSPATH . WPINC . '/registration.php');
 
-$action = $_REQUEST['action'];
-if ( !get_option('users_can_register') )
-	$action = 'disabled';
+# This file is deprecated, but you shouldn't have been linking to it directly anyway :P
+# Use wp_register() instead, it's much better ;)
 
-header( 'Content-Type: ' . get_bloginfo('html_type') . '; charset=' . get_bloginfo('charset') );
+require('./wp-config.php');
+wp_redirect('wp-login.php?action=register');
+exit();
 
-switch( $action ) {
-
-case 'register':
-
-	$user_login = sanitize_user( $_POST['user_login'] );
-	$user_email = $_POST['user_email'];
-
-	$errors = array();
-
-	if ( $user_login == '' )
-		$errors['user_login'] = __('<strong>ERROR</strong>: Please enter a username.');
-
-	/* checking e-mail address */
-	if ($user_email == '') {
-		$errors['user_email'] = __('<strong>ERROR</strong>: Please type your e-mail address.');
-	} else if (!is_email($user_email)) {
-		$errors['user_email'] = __('<strong>ERROR</strong>: The email address isn&#8217;t correct.');
-		$user_email = '';
-	}
-
-	if ( ! validate_username($user_login) ) {
-		$errors['user_login'] = __('<strong>ERROR</strong>: This username is invalid.  Please enter a valid username.');
-		$user_login = '';
-	}
-
-	if ( username_exists( $user_login ) )
-		$errors['user_login'] = __('<strong>ERROR</strong>: This username is already registered, please choose another one.');
-
-	if ( email_exists( $user_email ) )
-		$errors['user_email'] = __('<strong>ERROR</strong>: This email is already registered, please choose another one.');
-
-	if ( 0 == count($errors) ) {
-		$password = substr( md5( uniqid( microtime() ) ), 0, 7);
-
-		$user_id = wp_create_user( $user_login, $password, $user_email );
-		if ( !$user_id )
-			$errors['user_id'] = sprintf(__('<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href="mailto:%s">webmaster</a> !'), get_option('admin_email'));
-		else
-			wp_new_user_notification($user_id, $password);
-	}
-
-	if ( 0 == count($errors) ) {
-
-	?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>WordPress &raquo; <?php _e('Registration Complete') ?></title>
-	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
-	<link rel="stylesheet" href="wp-admin/wp-admin.css" type="text/css" />
-	<style type="text/css">
-	.submit {
-		font-size: 1.7em;
-	}
-	</style>
-</head>
-<body>
-
-<div id="login"> 
-	<h2><?php _e('Registration Complete') ?></h2>
-	<p><?php printf(__('Username: %s'), "<strong>" . wp_specialchars($user_login) . "</strong>") ?><br />
-	<?php printf(__('Password: %s'), '<strong>' . __('emailed to you') . '</strong>') ?> <br />
-	<?php printf(__('E-mail: %s'), "<strong>" . wp_specialchars($user_email) . "</strong>") ?></p>
-	<p class="submit"><a href="wp-login.php"><?php _e('Login &raquo;'); ?></a></p>
-</div>
-</body>
-</html>
-
-		<?php
-		break;
-	}
-
-default:
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>WordPress &raquo; <?php _e('Registration Form') ?></title>
-	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
-	<link rel="stylesheet" href="wp-admin/wp-admin.css" type="text/css" />
-	<style type="text/css">
-	#user_email, #user_login, #submit {
-		font-size: 1.7em;
-	}
-	</style>
-</head>
-
-<body>
-<div id="login">
-<h1><a href="http://wordpress.org/">WordPress</a></h1>
-<h2><?php _e('Register for this blog') ?></h2>
-<?php if ( isset($errors) ) : ?>
-<div class="error">
-	<p>
-	<?php
-	foreach($errors as $error) echo "$error<br />";
-	?>
-	</p>
-</div>
-<?php endif; ?>
-<form method="post" action="wp-register.php" id="registerform">
-	<p><input type="hidden" name="action" value="register" />
-	<label for="user_login"><?php _e('Username:') ?></label><br /> <input type="text" name="user_login" id="user_login" size="20" maxlength="20" value="<?php echo wp_specialchars($user_login); ?>" /><br /></p>
-	<p><label for="user_email"><?php _e('E-mail:') ?></label><br /> <input type="text" name="user_email" id="user_email" size="25" maxlength="100" value="<?php echo wp_specialchars($user_email); ?>" /></p>
-	<p><?php _e('A password will be emailed to you.') ?></p>
-	<p class="submit"><input type="submit" value="<?php _e('Register &raquo;') ?>" id="submit" name="submit" /></p>
-</form>
-<ul>
-	<li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>">&laquo; <?php _e('Back to blog') ?></a></li>
-	<li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Login') ?></a></li>
-	<li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=lostpassword" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a></li>
-</ul>
-</div>
-
-</body>
-</html>
-<?php
-
-break;
-
-case 'disabled':
-
-	?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>WordPress &raquo; <?php _e('Registration Currently Disabled') ?></title>
-	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
-	<link rel="stylesheet" href="wp-admin/wp-admin.css" type="text/css">
-</head>
-
-<body>
-
-<div id="login">
-	<h2><?php _e('Registration Disabled') ?></h2>
-	<p><?php _e('User registration is currently not allowed.') ?><br />
-	<a href="<?php echo get_option('home'); ?>/" title="<?php _e('Go back to the blog') ?>"><?php _e('Home') ?></a>
-	</p>
-</div>
-
-</body>
-</html>
-
-	<?php
-break;
-
-}
-?>
+?>
\ No newline at end of file
