diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index 84c684676d..cbae0496cb 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -87,7 +87,7 @@ if (!current_user_can('edit_users')) $errors['head'] = __('You do not have permi
 // print_r($profileuser);
 echo '<select name="role">';
 foreach($wp_roles->role_names as $role => $name) {
-	$selected = ($profileuser->roles[0] == $role) ? ' selected="selected"' : '';
+	$selected = ($profileuser->has_cap($role)) ? ' selected="selected"' : '';
 	echo "<option value=\"{$role}\"{$selected}>{$name}</option>";
 }
 echo '</select>';