diff --git a/apps/red-ui/src/app/utils/main.resolver.ts b/apps/red-ui/src/app/utils/main.resolver.ts
index 0f076fdf0..90fe00c94 100644
--- a/apps/red-ui/src/app/utils/main.resolver.ts
+++ b/apps/red-ui/src/app/utils/main.resolver.ts
@@ -57,7 +57,8 @@ export const mainResolver: ResolveFn<void> = async () => {
     }
 
     loadingService.stop();
-    tenantsService.storeTenant(userService.currentUser.email);
+    const currentUser = userService.currentUser;
+    tenantsService.storeTenant(currentUser.email ?? currentUser.username);
 
     logger.info('[ROUTES] Main resolver finished!');
 };
diff --git a/libs/common-ui b/libs/common-ui
index daf516e9f..140ad5564 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit daf516e9fef6206f39d4bbfff3ff6b4b763f4685
+Subproject commit 140ad55646af8c19982a0f69877908c3f998d9d9