diff --git a/src/Services/Cache/UserCacheKeyGenerator.php b/src/Services/Cache/UserCacheKeyGenerator.php
index be1b7ad6..ac5487a5 100644
--- a/src/Services/Cache/UserCacheKeyGenerator.php
+++ b/src/Services/Cache/UserCacheKeyGenerator.php
@@ -60,7 +60,7 @@ class UserCacheKeyGenerator
             return 'user$_'.User::ID_ANONYMOUS;
         }
 
-        //In the most cases we can just use the username (its unique)
-        return 'user_'.$user->getUsername().'_'.$locale;
+        //Use the unique user id and the locale to generate the key
+        return 'user_'.$user->getID().'_'.$locale;
     }
 }