diff --git a/common/core/src/main/java/com/supwisdom/institute/backend/common/core/transmit/user/UserContext.java b/common/core/src/main/java/com/supwisdom/institute/backend/common/core/transmit/user/UserContext.java
index d11d7a8..26532ed 100644
--- a/common/core/src/main/java/com/supwisdom/institute/backend/common/core/transmit/user/UserContext.java
+++ b/common/core/src/main/java/com/supwisdom/institute/backend/common/core/transmit/user/UserContext.java
@@ -23,11 +23,11 @@
   public static String getUsername() {
     User u = user.get();
     
-    if (u != null) {
-      return u.getUsername();
+    if (u == null) {
+      u = User.ANONYMOUS;
     }
     
-    return null;
+    return u.getUsername();
   }
 
 }