diff --git role_change_notify.module role_change_notify.module
index d6b1314..085aa6e 100644
--- role_change_notify.module
+++ role_change_notify.module
@@ -3,12 +3,12 @@
 
 /**
  * @file
- * Send email to users when a new role is assigned
+ * Send email or trigger actions when a new role is assigned
  *
  */
 
-define('RCN_SUBJECT_DEFAULT', t('Role [role] added for [user] at [site-name]'));
-define('RCN_BODY_DEFAULT', t("[user],\n\nThe role \"[role]\" has been added to your account at  [site-name].\n\nYou may now use the associated privileges."));
+define('RCN_SUBJECT_DEFAULT', t('Role [role_changed] added for [user] at [site-name]'));
+define('RCN_BODY_DEFAULT', t("[user],\n\nThe role \"[role_changed]\" has been added to your account at  [site-name].\n\nYou may now use the associated privileges."));
 /**
  * Print module description on module activation page
  */
@@ -27,7 +27,7 @@ function role_change_notify_help($path, $arg) {
       $output .= '<p>'. t('This page allows you to configure whether automatic emails should be set to users when a new role is assigned to them. You define if an email should be sent for each role type, and if so, you define what the subject and body of the resulting email will be.') .'</p>'
       .'<p>'. t('For any of the settings below, you can use placeholders which will be substituted with the current values for the user, role, and site.') .' ';
       if (!module_exists('token')) {
-        $output .= t('Available variables are:') . '[user] (username), [uid], [site-name], [site-url], [uri_brief], [mail], [site-date], [login_uri], [account-edit], [role].';
+        $output .= t('Available variables are:') . '[user] (username), [uid], [site-name], [site-url], [uri_brief], [mail], [site-date], [login_uri], [account-edit], [role_changed], [role].';
         if (module_exists('profile')) {
           $output .= t('<br/>User profile variables are also available in the') . ' [profile_value] ' . t('format.');
         }
@@ -258,6 +258,7 @@ function role_change_notify_user_update($edit, $account) {
           profile_load_profile($account);
         }
         if(module_exists('token')){
+          token_get_values('global', NULL, TRUE);  // Flush tokens so it knows user object has changed.
           $subject = token_replace(variable_get('role_change_notify_role_added_subject', RCN_SUBJECT_DEFAULT), $type = 'user', $account);
           $body = token_replace(variable_get('role_change_notify_role_added_body', RCN_BODY_DEFAULT), $type = 'user', $account);
         }else{
@@ -332,6 +333,7 @@ function _role_change_notify_get_variables($account, $rolename) {
     '[login_uri]' => url('user', array('absolute' => TRUE)),
     '[account-edit]' => url('user/'. $account->uid .'/edit', array('absolute' => TRUE)),
     '[role]' => $rolename,
+    '[role_changed]' => $rolename,
   );
   // If the profile module is present, create replacement patters for the values
   if ($account->uid && module_exists('profile')) {
@@ -359,6 +361,7 @@ function role_change_notify_token_values($type, $object = NULL) {
         'uri_brief' => drupal_substr($base_url, drupal_strlen($isSSL ? 'https://' : 'http://')),
         'login_uri' => url('user', array('absolute' => TRUE)),
         'role' => $account->rolename,
+        'role_changed' => $account->rolename,
     );
 
     if (module_exists('profile')) {
@@ -386,7 +389,8 @@ function role_change_notify_token_list($type = 'profile') {
     }
     $tokens['global']['uri_brief'] = t('Brief site URL');
     $tokens['user']['login_uri'] = t('Login URL');
-    $tokens['user']['role'] = t('Name of the role being added');
+    $tokens['user']['role'] = t('Name of the role being added or removed');
+    $tokens['user']['role_changed'] = t('Name of the role being added or removed');
 
     return $tokens;
   }