Index: wp-admin/wp-admin.css
===================================================================
--- wp-admin/wp-admin.css	(revision 7272)
+++ wp-admin/wp-admin.css	(working copy)
@@ -814,8 +814,7 @@
 	border-style: solid;
 }
 
-.form-table label.color-option {
-	display: block;
+.form-table div.color-option {
 	clear: both;
 }
 
@@ -1338,4 +1337,4 @@
 
 #templateside ul li a {
 	text-decoration: none;
-}
\ No newline at end of file
+}
Index: wp-admin/user-edit.php
===================================================================
--- wp-admin/user-edit.php	(revision 7272)
+++ wp-admin/user-edit.php	(working copy)
@@ -161,18 +161,20 @@
 if ( empty($current_color) )
 	$current_color = 'classic';
 foreach ( $_wp_admin_css_colors as $color => $color_info ): ?>
-<label class="color-option"><input name="admin_color" type="radio" value="<?php echo $color ?>" class="tog" <?php checked($color, $current_color); ?> />
+<div class="color-option">
+<input name="admin_color" type="radio" id="color-option-<?php echo $color?>" value="<?php echo $color ?>" class="tog" <?php checked($color, $current_color); ?> />
 	<table class="color-palette">
 	<tr>
 	<?php
-	foreach ( $color_info->colors as $color ): ?>
-	<td style="background-color: <?php echo $color ?>" title="<?php echo $color ?>"></td>
+	foreach ( $color_info->colors as $html_color ): ?>
+	<td style="background-color: <?php echo $html_color ?>" title="<?php echo $html_color ?>"></td>
 	<?php endforeach; ?>
 	</tr>
 	</table>
-	
-	<?php echo $color_info->name ?>
-</label>
+	<label class="color-option" for="color-option-<?php echo $color; ?>">
+		<?php echo $color_info->name ?>
+	</label>
+</div>
 <?php endforeach; ?>
 </td>
 </tr>
@@ -303,7 +305,7 @@
 		<input type="password" name="pass2" id="pass2" size="16" value="" /> <?php _e("Type your new password again."); ?><br />
 		<?php if ( $is_profile_page ): ?>
 		<p><strong><?php _e('Password Strength:'); ?></strong></p>
-		<div id="pass-strength-result"><?php _e('Too short'); ?></div> <?php _e('Hint: Use upper and lower case characters, numbers and symbols like !"?$%^&( in your password.'); ?>
+		<div id="pass-strength-result"><?php _e('Too short'); ?></div> <?php _e('Hint: Use upper and lower case characters, numbers and symbols like !"?$%^&amp;( in your password.'); ?>
 		<?php endif; ?>
 	</td>
 </tr>