diff --git a/openbb_terminal/session/session_model.py b/openbb_terminal/session/session_model.py
index 1f0a393f661..dc1eaeb3db9 100644
--- a/openbb_terminal/session/session_model.py
+++ b/openbb_terminal/session/session_model.py
@@ -48,8 +48,10 @@ def login(session: dict) -> LoginStatus:
     response = Hub.fetch_user_configs(session)
     if response:
         if response.status_code == 200:
-            User.load_user_info(session)
-            Local.apply_configs(configs=json.loads(response.content))
+            configs = json.loads(response.content)
+            email = configs.get("email", "")
+            User.load_user_info(session, email)
+            Local.apply_configs(configs=configs)
             return LoginStatus.SUCCESS
         return LoginStatus.FAILED
     return LoginStatus.NO_RESPONSE
diff --git a/openbb_terminal/session/user.py b/openbb_terminal/session/user.py
index 3e0208e8df0..cf6aff072f5 100644
--- a/openbb_terminal/session/user.py
+++ b/openbb_terminal/session/user.py
@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-import jwt
 import openbb_terminal.feature_flags as obbff
 from openbb_terminal.rich_config import console
 
@@ -12,7 +11,7 @@ class User:
     _UUID: str = ""
 
     @classmethod
-    def load_user_info(cls, session: dict):
+    def load_user_info(cls, session: dict, email: str):
         """Load user info from login info.
 
         Parameters
@@ -23,12 +22,8 @@ class User:
         User._TOKEN_TYPE = session.get("token_type", "")
         User._TOKEN = session.get("access_token", "")
         User._UUID = session.get("uuid", "")
-
-        if User._TOKEN:
-            decoded_info = jwt.decode(User._TOKEN, options={"verify_signature": False})
-            User._EMAIL = decoded_info.get("sub", "")
-
-            # Add username to flair
+        User._EMAIL = email
+        if User._EMAIL:
             User.update_flair()
 
     @classmethod