diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 1ca0386219..e4252a502b 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -499,6 +499,7 @@ input.disabled, textarea.disabled {
 	border-bottom: none;
 	margin: 0;
 	padding: 3px 2em 0 3em;
+	height: 25px;
 }
 
 #minisub {
@@ -526,7 +527,6 @@ input.disabled, textarea.disabled {
 
 #submenu li {
 	line-height: 180%;
-	height: 25px;
 }
 
 
@@ -674,9 +674,17 @@ input.delete:hover {
 	position: relative;
 	background: url('images/login-bkg-tile.gif') no-repeat top center;
 	color: #fff;
-	margin: 5em auto;
-	padding: 20px 50px 0;
-	width: 325px;
+	margin: 5em auto 1em;
+	padding: 20px 0 0;
+	width: 425px;
+	_width: 390px;
+}
+
+#login form {
+	background: url('images/login-bkg-bottom.gif') no-repeat bottom center;
+	padding: 0 50px 25px;
+	_width: 325px;
+	_margin: 0 auto;
 }
 
 #login #login_error {
@@ -686,9 +694,20 @@ input.delete:hover {
 	font-size: 11px;
 	font-weight: bold;
 	padding: .6em;
+	width: 310px;
+	margin: 0 auto;
 	text-align: center;
 }
 
+#login p { 
+	font-size: 12px;
+}
+
+#login p.message { 
+	width: 310px;
+	margin: 0 auto 1em;
+}
+
 #login #login_error a {
 	color: #ebcd4e;
 	border-color: #ebcd4e;
@@ -699,6 +718,8 @@ input.delete:hover {
 	text-align: left;
 	font-weight: normal;
 	font-size: 1.1em;
+	_width: 325px;
+	_margin: 0 auto 15px;
 }
 
 #login h1 a {
@@ -726,40 +747,24 @@ input.delete:hover {
 	padding: 4px;
 }
 
-#login ul {
-	background: url('images/login-bkg-bottom.gif') no-repeat bottom center;
+.login ul, #protected #login .bottom {
 	list-style: none;
-	margin: 0 -50px;
-	padding: 10px 50px 25px;;
+	width: 325px;
+	margin: 0 auto;
+	padding: 0;
+	line-height: 1.2;
 }
 
-#login ul:after {
-	content: ".";
-	display: block;
-	height: 0;
-	clear: both;
-	visibility: hidden;
+.login ul li {
+	font-size: 11px;
 }
 
-#login ul li {
-	float: left;
-	font-size: 12px;
-	padding: 5px 0;
-	text-align: center;
-}
-
-#login ul li a {
-	display: block;
-	color: #84c4f0;
+.login ul li a {
+	color: #0d324f;
 	border: none;
-	padding: 4px 1px 5px;
-	width: 160px;
 }
 
 #login ul li a:hover {
-	background: #0e3350;
-	border: 1px solid #2571ab;
-	padding: 3px 0 4px; 
 	color: #fff;
 }
 
@@ -777,6 +782,7 @@ input.delete:hover {
 	margin: 0;
 	font-size: 15px;
 }
+
 .plugins p {
 }
 
diff --git a/wp-login.php b/wp-login.php
index 71ba4dfe0f..510be05d94 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -44,7 +44,7 @@ function login_header($title = 'Login', $message = '') {
 	</script>
 <?php do_action('login_head'); ?>
 </head>
-<body>
+<body class="login">
 
 <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
@@ -147,17 +147,19 @@ case 'retrievepassword' :
 <?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>
+</div>
+
 <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>
+	<li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title')); ?></a></li>
 <?php else : ?>
-	<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('home'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title')); ?></a></li>
 	<li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Login') ?></a></li>
 <?php endif; ?>
 </ul>
-</div>
+
 </body>
 </html>
 <?php
@@ -265,12 +267,14 @@ case 'register' :
 	<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>
+</div>
+
 <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>
+	<li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>"><?php _e('Back to') ?> <?php bloginfo('title'); ?></a></li>
 </ul>
-</div>
+
 </body>
 </html>
 <?php
@@ -353,17 +357,19 @@ default:
 		<input type="hidden" name="redirect_to" value="<?php echo wp_specialchars($redirect_to); ?>" />
 	</p>
 </form>
+</div>
+
 <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>
+	<li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>"><?php _e('Back to') ?> <?php bloginfo('title'); ?></a></li>
 <?php else : ?>
-	<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('home'); ?>/" title="<?php _e('Are you lost?') ?>"><?php _e('Back to') ?> <?php bloginfo('title'); ?></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; ?>
 </ul>
-</div>
+
 
 </body>
 </html>
