diff --git role_change_notify.module role_change_notify.module
index 79f68dd..c42f6ad 100644
--- role_change_notify.module
+++ role_change_notify.module
@@ -348,7 +348,7 @@ function role_change_notify_token_values($type, $account = NULL) {
     if (module_exists('profile')) {
       $keys = array_keys(get_object_vars($account));
       foreach($keys as $key) {
-        if(strpos($key, 'profile_') === 0) {
+        if(strpos($key, 'profile_') === 0 && !empty($account->$key)) {
           $tokens[$key] = check_plain($account->$key);
         }
       }