diff --git a/rules/modules/user.rules.inc b/rules/modules/user.rules.inc
index 5db5bb6..dd73af7 100644
--- a/rules/modules/user.rules.inc
+++ b/rules/modules/user.rules.inc
@@ -161,7 +161,7 @@ function user_rules_action_info() {
       ),
       'help' => t('Enter an id or a name of the user to load.'),
       'module' => 'User',
-      'eval input' => array('userid', 'username'),
+      'eval input' => array('userid', 'username', 'mail'),
     ),
     'rules_action_user_create' => array(
       'label' => t('Create a user'),
@@ -215,7 +215,12 @@ function rules_action_user_removerole($user, $settings) {
  * Loads a user
  */
 function rules_action_load_user($settings) {
-  $userarray = array('name' => $settings['username'], 'uid' => $settings['userid']);
+  if (isset($settings['mail'])) {
+    $userarray = array('name' => $settings['username'], 'uid' => $settings['userid'], 'mail' => $settings['mail']);  
+  }
+  else {
+    $userarray = array('name' => $settings['username'], 'uid' => $settings['userid']);
+  }	
   return array('user_loaded' => user_load(array_filter($userarray)));
 }
 
diff --git a/rules/modules/user.rules_forms.inc b/rules/modules/user.rules_forms.inc
index 0d72802..41a3482 100644
--- a/rules/modules/user.rules_forms.inc
+++ b/rules/modules/user.rules_forms.inc
@@ -84,11 +84,17 @@ function rules_action_load_user_form($settings, &$form) {
     '#default_value' => isset($settings['userid']) ? $settings['userid'] : '',
     '#description' => t('Id of the user to be loaded.'),
   );
+  $form['settings']['mail'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Mail'),
+    '#default_value' => isset($settings['mail']) ? $settings['mail'] : '',
+    '#description' => t('Mail of the user to be loaded.'),
+  );
 }
 
 function rules_action_load_user_validate($form, $form_state) {
-  if (!$form_state['values']['settings']['username'] && !$form_state['values']['settings']['userid']) {
-    form_set_error('username', t('You have to enter the user name or the user id.'));
+  if (!$form_state['values']['settings']['username'] && !$form_state['values']['settings']['userid'] && !$form_state['values']['settings']['mail']) {
+    form_set_error('username', t('You have to enter the user name, the user id or the user mail.'));
   }
 }