diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index 932c205..20d7c6c 100644
--- a/modules/user/user.admin.inc
+++ b/modules/user/user.admin.inc
@@ -24,7 +24,6 @@ function user_admin($callback_arg = '') {
   $op = isset($_POST['op']) ? $_POST['op'] : $callback_arg;

   switch ($op) {
-    case t('Create new account'):
     case 'create':
       $build['user_register'] = drupal_get_form('user_register_form');
       break;
@@ -100,15 +99,18 @@ function user_filter_form() {
   );
   $form['filters']['status']['actions']['submit'] = array(
     '#type' => 'submit',
+    '#name' => (count($session) ? 'refine' : 'filter'),
     '#value' => (count($session) ? t('Refine') : t('Filter')),
   );
   if (count($session)) {
     $form['filters']['status']['actions']['undo'] = array(
       '#type' => 'submit',
+      '#name' => 'undo',
       '#value' => t('Undo'),
     );
     $form['filters']['status']['actions']['reset'] = array(
       '#type' => 'submit',
+      '#name' => 'reset',
       '#value' => t('Reset'),
     );
   }
@@ -122,11 +124,11 @@ function user_filter_form() {
  * Process result from user administration filter form.
  */
 function user_filter_form_submit($form, &$form_state) {
-  $op = $form_state['values']['op'];
+  $op = $form_state['triggering_element']['#name'];
   $filters = user_filters();
   switch ($op) {
-    case t('Filter'):
-    case t('Refine'):
+    case 'filter':
+    case 'refine':
       // Apply every filter that has a choice selected other than 'any'.
       foreach ($filters as $filter => $options) {
         if (isset($form_state['values'][$filter]) && $form_state['values'][$filter] != '[any]') {
@@ -139,13 +141,13 @@ function user_filter_form_submit($form, &$form_state) {
         }
       }
       break;
-    case t('Undo'):
+    case 'undo':
       array_pop($_SESSION['user_overview_filter']);
       break;
-    case t('Reset'):
+    case 'reset':
       $_SESSION['user_overview_filter'] = array();
       break;
-    case t('Update'):
+    case 'update':
       return;
   }

@@ -875,6 +877,7 @@ function user_admin_roles($form, $form_state) {
   );
   $form['add'] = array(
     '#type' => 'submit',
+    '#name' => 'add_role',
     '#value' => t('Add role'),
     '#validate' => array('user_admin_role_validate'),
     '#submit' => array('user_admin_role_submit'),
@@ -974,10 +977,12 @@ function user_admin_role($form, $form_state, $role) {
   $form['actions'] = array('#type' => 'actions');
   $form['actions']['submit'] = array(
     '#type' => 'submit',
+    '#name' => 'save_role',
     '#value' => t('Save role'),
   );
   $form['actions']['delete'] = array(
     '#type' => 'submit',
+    '#name' => 'delete_role',
     '#value' => t('Delete role'),
     '#submit' => array('user_admin_role_delete_submit'),
   );
@@ -989,14 +994,14 @@ function user_admin_role($form, $form_state, $role) {
  * Form validation handler for the user_admin_role() form.
  */
 function user_admin_role_validate($form, &$form_state) {
-  if (!empty($form_state['values']['name'])) {
-    if ($form_state['values']['op'] == t('Save role')) {
+  if (!empty($form_state['triggering_element']['#name'])) {
+    if ($form_state['triggering_element']['#name'] == 'save_role') {
       $role = user_role_load_by_name($form_state['values']['name']);
       if ($role && $role->rid != $form_state['values']['rid']) {
         form_set_error('name', t('The role name %name already exists. Choose another role name.', array('%name' => $form_state['values']['name'])));
       }
     }
-    elseif ($form_state['values']['op'] == t('Add role')) {
+    elseif ($form_state['triggering_element']['#name'] == 'add_role') {
       if (user_role_load_by_name($form_state['values']['name'])) {
         form_set_error('name', t('The role name %name already exists. Choose another role name.', array('%name' => $form_state['values']['name'])));
       }
@@ -1012,11 +1017,11 @@ function user_admin_role_validate($form, &$form_state) {
  */
 function user_admin_role_submit($form, &$form_state) {
   $role = (object) $form_state['values'];
-  if ($form_state['values']['op'] == t('Save role')) {
+  if ($form_state['triggering_element']['#name'] == 'save_role') {
     user_role_save($role);
     drupal_set_message(t('The role has been renamed.'));
   }
-  elseif ($form_state['values']['op'] == t('Add role')) {
+  elseif ($form_state['triggering_element']['#name'] == 'add_role') {
     user_role_save($role);
     drupal_set_message(t('The role has been added.'));
   }
diff --git a/modules/user/user.module b/modules/user/user.module
index bff6f76..793c317 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -3766,6 +3766,7 @@ function user_register_form($form, &$form_state) {
   $form['actions'] = array('#type' => 'actions');
   $form['actions']['submit'] = array(
     '#type' => 'submit',
+    '#name' => 'create',
     '#value' => t('Create new account'),
   );