diff --git a/modules/sms_user/sms_user.module b/modules/sms_user/sms_user.module
index 58fb488..df4274b 100644
--- a/modules/sms_user/sms_user.module
+++ b/modules/sms_user/sms_user.module
@@ -56,7 +56,6 @@ function sms_user_menu_alter(&$callbacks) {
   $callbacks['user/%user_category/edit/mobile']['page arguments'] = array(1);
   $callbacks['user/%user_category/edit/mobile']['module'] = 'sms_user';
   $callbacks['user/%user_category/edit/mobile']['file'] = 'sms_user.module';
-  //dsm($callbacks);
 }
 
 /**
@@ -338,7 +337,7 @@ function sms_user_settings_confirm_form_submit($form, &$form_state) {
     user_save($account, array('sms_user' => $data), 'mobile');
     // If the rule module is installed, fire rules
     if (module_exists('rules')) {
-      rules_invoke_event('sms_user_validated', $account);
+      rules_invoke_event('sms_user_number_validated', $account);
     }
   }
 }
@@ -377,7 +376,7 @@ function sms_user_settings_reset_form_submit($form, &$form_state) {
   $account = user_load($form_state['values']['uid']);
   sms_user_delete($account->uid);
   if (module_exists('rules')) {
-    rules_invoke_event('sms_user_removed', $account);
+    rules_invoke_event('sms_user_number_removed', $account);
   }
   drupal_set_message(t('Your mobile information has been removed'), 'status');
 }
@@ -1120,9 +1119,10 @@ function entity_property_sms_user_get_properties($data, array $options, $name, $
     if (isset($account->sms_user)) {
       switch ($name) {
         case "sms_user_phone_number" :
-          return $account->sms_user['number'];
+          return isset($account->sms_user['number']) ? $account->sms_user['number'] : '';
           break;
         case "sms_user_status" :
+          if (!isset($account->sms_user['status'])) return t('Blocked');
           switch ($account->sms_user['status']) {
             case SMS_USER_BLOCKED:
               return t('Blocked');
diff --git a/modules/sms_user/sms_user.rules.inc b/modules/sms_user/sms_user.rules.inc
index 141e273..a887547 100644
--- a/modules/sms_user/sms_user.rules.inc
+++ b/modules/sms_user/sms_user.rules.inc
@@ -12,20 +12,20 @@
  */
 function sms_user_rules_event_info() {
   return array(
-    'sms_user_validated' => array(
+    'sms_user_number_validated' => array(
       'label' => t('User validated SMS code'),
-      'module' => 'SMS',
-      'arguments' => array(
+      'group' => t('SMS'),
+      'variables' => array(
         'user' => array(
           'type' => 'user',
           'label' => t('User validated SMS code'),
         ),
       ),
     ),
-    'sms_user_removed' => array(
+    'sms_user_number_removed' => array(
       'label' => t('User removed mobile phone number'),
-      'module' => 'SMS',
-      'arguments' => array(
+      'group' => t('SMS'),
+      'variables' => array(
         'user' => array(
           'type' => 'user',
           'label' => t('User removed mobile phone number'),
@@ -43,7 +43,7 @@ function sms_user_rules_action_info() {
     'sms_action_user_send' => array(
       'label' => t('Send SMS message to user'),
       'group' => t('SMS'),
-      'arguments' => array(
+      'parameter' => array(
         'user' => array(
           'type' => 'user',
           'label' => t('User'),
@@ -57,10 +57,10 @@ function sms_user_rules_action_info() {
     'sms_action_match_user' => array(
       'label' => t('Match mobile number to user'),
       'group' => t('SMS'),
-      'arguments' => array(
+      'parameter' => array(
         'number' => array(
-          'type' => 'string',
-          'label' => t('Mobile number'),
+          'type' => 'text',
+          'label' => t('Phone number'),
         ),
       ),
       'new variables' => array(
@@ -87,4 +87,3 @@ function sms_action_user_send($user, $message) {
 function sms_action_match_user($number) {
   return array('user_loaded' => user_load(sms_user_get_uid($number)));
 }
-
diff --git a/sms.rules.inc b/sms.rules.inc
index d9bd197..70950f7 100644
--- a/sms.rules.inc
+++ b/sms.rules.inc
@@ -14,7 +14,7 @@ function sms_rules_event_info() {
       'label' => t('A SMS message is received'),
       'access callback' => 'sms_rules_access_callback',
       'module' => 'sms',
-      'group' => t('SMS Framework'),
+      'group' => t('SMS'),
       'variables' => array(
         'sms' => array(
           'label' => t('SMS Message'),