diff --git a/wp-admin/profile-update.php b/wp-admin/profile-update.php
index b101f9717..e9eeac38c 100644
--- a/wp-admin/profile-update.php
+++ b/wp-admin/profile-update.php
@@ -1,76 +1,64 @@
-<?php
-
-require_once('admin.php');
-
-check_admin_referer();
-
-/* if the ICQ UIN has been entered, check to see if it has only numbers */
-if (!empty($_POST["newuser_icq"])) {
-	if ((ereg("^[0-9]+$",$_POST["newuser_icq"]))==false) {
-		die (__("<strong>ERROR</strong>: your ICQ UIN can only be a number, no letters allowed"));
-		return false;
-	}
-}
-
-/* checking e-mail address */
-if (empty($_POST["newuser_email"])) {
-	die (__("<strong>ERROR</strong>: please type your e-mail address"));
-	return false;
-} else if (!is_email($_POST["newuser_email"])) {
-	die (__("<strong>ERROR</strong>: the e-mail address isn't correct"));
-	return false;
-}
-
-$pass1 = $_POST['pass1'];
-$pass2 = $_POST['pass2'];
-do_action('check_passwords', array($user_login, &$pass1, &$pass2));
-
-if ( '' == $pass1 ) {
-	if ( '' != $pass2 )
-		die (__('<strong>ERROR</strong>: you typed your new password only once. Go back to type it twice.'));
-	$updatepassword = '';
-} else {
-	if ('' == $pass2)
-		die (__('<strong>ERROR</strong>: you typed your new password only once. Go back to type it twice.'));
-	if ( $pass1 != $pass2 )
-		die (__('<strong>ERROR</strong>: you typed two different passwords. Go back to correct that.'));
-	$newuser_pass = $pass1;
-	$updatepassword = "user_pass=MD5('$newuser_pass'), ";
-	wp_clearcookie();
-	wp_setcookie($user_login, $newuser_pass);
-}
-
-$newuser_firstname = wp_specialchars($_POST['newuser_firstname']);
-$newuser_lastname = wp_specialchars($_POST['newuser_lastname']);
-$new_display_name = wp_specialchars($_POST['display_name']);
-$newuser_nickname = $_POST['newuser_nickname'];
-$newuser_nicename = sanitize_title($newuser_nickname);
-$jabber = wp_specialchars($_POST['jabber']);
-$newuser_aim = wp_specialchars($_POST['newuser_aim']);
-$newuser_yim = wp_specialchars($_POST['newuser_yim']);
-$newuser_email = wp_specialchars($_POST['newuser_email']);
-$newuser_url = wp_specialchars($_POST['newuser_url']);
-$newuser_url = preg_match('/^(https?|ftps?|mailto|news|gopher):/is', $newuser_url) ? $newuser_url : 'http://' . $newuser_url; 
-$user_description = $_POST['user_description'];
-
-$result = $wpdb->query("UPDATE $wpdb->users SET $updatepassword user_email='$newuser_email', user_url='$newuser_url', user_nicename = '$newuser_nicename', display_name = '$new_display_name' WHERE ID = $user_ID");
-
-update_usermeta( $user_ID, 'first_name', $newuser_firstname );
-update_usermeta( $user_ID, 'last_name', $newuser_lastname );
-update_usermeta( $user_ID, 'nickname', $newuser_nickname );
-update_usermeta( $user_ID, 'description', $user_description );
-update_usermeta( $user_ID, 'jabber', $jabber );
-update_usermeta( $user_ID, 'aim', $newuser_aim );
-update_usermeta( $user_ID, 'yim', $newuser_yim );
-
-do_action('profile_update', $user_ID);
-
-if ( 'profile' == $_POST['from'] )
-	$to = 'profile.php?updated=true';
-else
-	$to = 'profile.php?updated=true';
-
-wp_redirect( $to );
-exit;
-
+<?php
+
+require_once('admin.php');
+
+check_admin_referer();
+
+if ( empty($_POST['email']) )
+	die (__("<strong>ERROR</strong>: please type your e-mail address"));
+elseif ( !is_email($_POST['email']) )
+	die (__("<strong>ERROR</strong>: the e-mail address isn't correct"));
+
+$pass1 = $_POST['pass1'];
+$pass2 = $_POST['pass2'];
+do_action('check_passwords', array($user_login, &$pass1, &$pass2));
+
+if ( '' == $pass1 ) {
+	if ( '' != $pass2 )
+		die (__('<strong>ERROR</strong>: you typed your new password only once. Go back to type it twice.'));
+	$updatepassword = '';
+} else {
+	if ('' == $pass2)
+		die (__('<strong>ERROR</strong>: you typed your new password only once. Go back to type it twice.'));
+	if ( $pass1 != $pass2 )
+		die (__('<strong>ERROR</strong>: you typed two different passwords. Go back to correct that.'));
+	$newuser_pass = $pass1;
+	$updatepassword = "user_pass=MD5('$newuser_pass'), ";
+	wp_clearcookie();
+	wp_setcookie($user_login, $newuser_pass);
+}
+
+$first_name = wp_specialchars($_POST['first_name']);
+$last_name = wp_specialchars($_POST['last_name']);
+$display_name = wp_specialchars($_POST['display_name']);
+$nickname = $_POST['nickname'];
+$nicename = sanitize_title($nickname);
+$jabber = wp_specialchars($_POST['jabber']);
+$aim = wp_specialchars($_POST['aim']);
+$yim = wp_specialchars($_POST['yim']);
+$email = wp_specialchars($_POST['email']);
+$url = wp_specialchars($_POST['url']);
+$url = preg_match('/^(https?|ftps?|mailto|news|gopher):/is', $newuser_url) ? $newuser_url : 'http://' . $newuser_url; 
+$user_description = $_POST['user_description'];
+
+$result = $wpdb->query("UPDATE $wpdb->users SET $updatepassword user_email='$email', user_url='$url', user_nicename = '$nicename', display_name = '$display_name' WHERE ID = '$user_ID'");
+
+update_usermeta( $user_ID, 'first_name', $first_name );
+update_usermeta( $user_ID, 'last_name', $last_name );
+update_usermeta( $user_ID, 'nickname', $nickname );
+update_usermeta( $user_ID, 'description', $user_description );
+update_usermeta( $user_ID, 'jabber', $jabber );
+update_usermeta( $user_ID, 'aim', $aim );
+update_usermeta( $user_ID, 'yim', $yim );
+
+do_action('profile_update', $user_ID);
+
+if ( 'profile' == $_POST['from'] )
+	$to = 'profile.php?updated=true';
+else
+	$to = 'profile.php?updated=true';
+
+wp_redirect( $to );
+exit;
+
 ?>
\ No newline at end of file
diff --git a/wp-admin/profile.php b/wp-admin/profile.php
index e63329382..27bec9f84 100644
--- a/wp-admin/profile.php
+++ b/wp-admin/profile.php
@@ -31,13 +31,13 @@ $bookmarklet_height= 440;
 <input type="text" name="username" value="<?php echo $profiledata->user_login; ?>" disabled="disabled" />
 </label></p>
 <p><label><?php _e('First name:') ?><br />
-<input type="text" name="newuser_firstname" id="newuser_firstname" value="<?php echo $profiledata->first_name ?>" /></label></p>
+<input type="text" name="first_name" value="<?php echo $profiledata->first_name ?>" /></label></p>
 
 <p><label><?php _e('Last name:') ?><br />
-<input type="text" name="newuser_lastname" id="newuser_lastname2" value="<?php echo $profiledata->last_name ?>" /></label></p>
+<input type="text" name="last_name"  value="<?php echo $profiledata->last_name ?>" /></label></p>
 
 <p><label><?php _e('Nickname:') ?><br />
-<input type="text" name="newuser_nickname" id="newuser_nickname2" value="<?php echo $profiledata->nickname ?>" /></label></p>
+<input type="text" name="nickname" value="<?php echo $profiledata->nickname ?>" /></label></p>
 
 </p><label><?php _e('Display name publicly as:') ?> <br />
 <select name="display_name">
@@ -61,22 +61,22 @@ $bookmarklet_height= 440;
 <legend><?php _e('Contact Info'); ?></legend>
 
 <p><label><?php _e('E-mail: (required)') ?><br />
-<input type="text" name="newuser_email" id="newuser_email2" value="<?php echo $profiledata->user_email ?>" /></label></p>
+<input type="text" name="email" value="<?php echo $profiledata->user_email ?>" /></label></p>
 
 <p><label><?php _e('Website:') ?><br />
-<input type="text" name="newuser_url" id="newuser_url2" value="<?php echo $profiledata->user_url ?>" />
+<input type="text" name="url" value="<?php echo $profiledata->user_url ?>" />
 </label></p>
 
 <p><label><?php _e('AIM:') ?><br />
-<input type="text" name="newuser_aim" id="newuser_aim2" value="<?php echo $profiledata->aim ?>" />
+<input type="text" name="aim" value="<?php echo $profiledata->aim ?>" />
 </label></p>
 
 <p><label><?php _e('Yahoo IM:') ?><br />
-<input type="text" name="newuser_yim" id="newuser_yim2" value="<?php echo $profiledata->yim ?>" />
+<input type="text" name="yim" value="<?php echo $profiledata->yim ?>" />
 </label></p>
 
 <p><label><?php _e('Jabber / Google Talk:') ?>
-<input type="text" name="jabber" id="jabber" value="<?php echo $profiledata->jabber ?>" /></label>
+<input type="text" name="jabber" value="<?php echo $profiledata->jabber ?>" /></label>
 </p>
 </fieldset>
 <br clear="all" />
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 345955ffa..f8920b98b 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -681,7 +681,7 @@ table .vers, table .name {
 	margin: 1em; 
 }
 
-#your-profile fieldset input,  {
+#your-profile fieldset input  {
 	width: 100%;
 	font-size: 20px;
 	padding: 2px;