diff --git a/modules/user.views.inc b/modules/user.views.inc
index 70771045d2d5faa12cec16a829ab0a9efe576919..b492cf43ff0810b5abaf5d1ca9c5f8353a2aecc2 100644
--- a/modules/user.views.inc
+++ b/modules/user.views.inc
@@ -395,7 +395,6 @@ function user_views_data() {
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_user_roles',
-      'numeric' => TRUE,
       'allow empty' => TRUE,
     ),
     'argument' => array(
diff --git a/modules/user/views_handler_field_user_roles.inc b/modules/user/views_handler_field_user_roles.inc
index e6571cdbda81a0a54dc8e5f8dfcda7e4cd947b48..7c5f07b09591e1e218c7c6f08ed469a65003507c 100644
--- a/modules/user/views_handler_field_user_roles.inc
+++ b/modules/user/views_handler_field_user_roles.inc
@@ -45,7 +45,7 @@ function render_item($count, $item) {
 
   function document_self_tokens(&$tokens) {
     $tokens['[' . $this->options['id'] . '-role' . ']'] = t('The name of the role.');
-    $tokens['[' . $this->options['id'] . '-rid' . ']'] = t('The role ID of the role.');
+    $tokens['[' . $this->options['id'] . '-rid' . ']'] = t('The role machine-name of the role.');
   }
 
   function add_self_tokens(&$tokens, $item) {