diff --git role_change_notify.module role_change_notify.module
index 2c11f08..109b43b 100644
--- role_change_notify.module
+++ role_change_notify.module
@@ -225,6 +225,9 @@ function role_change_notify_user_update($edit, $account) {
     $role = $roles[$roleid];
     $account->rolename = $role;
 
+    if (module_exists('token')) {
+      token_get_values('global', NULL, TRUE); // Flush tokens so it knows user object has changed.
+    }
     // Invoke actions that should take place on role addition.
     _role_change_notify_trigger_actions('role_added', $account);
 
@@ -234,7 +237,6 @@ 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{