diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index 851451ac0..f7ab8f7a2 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -103,11 +103,22 @@ if ( !current_user_can('edit_user', $user_id) )
';
+$role_list = '';
+$user_has_role = false;
foreach($wp_roles->role_names as $role => $name) {
- $selected = ($profileuser->has_cap($role)) ? ' selected="selected"' : '';
- echo "";
+ if ( $profileuser->has_cap($role) ) {
+ $selected = ' selected="selected"';
+ $user_has_role = true;
+ } else {
+ $selected = '';
+ }
+ $role_list .= "";
}
-echo '';
+if ( $user_has_role )
+ $role_list .= '';
+else
+ $role_list .= '';
+echo $role_list . '';
?>