diff --git a/pms_api_rest/datamodels/pms_user.py b/pms_api_rest/datamodels/pms_user.py
index 83b03cef3..80683707e 100644
--- a/pms_api_rest/datamodels/pms_user.py
+++ b/pms_api_rest/datamodels/pms_user.py
@@ -11,6 +11,9 @@ class PmsApiRestUserInput(Datamodel):
 
 class PmsApiRestUserOutput(Datamodel):
     _name = "pms.api.rest.user.output"
-    # user = fields.String(required=False, allow_none=True)
-    # exp = fields.String(required=False, allow_none=True)
     token = fields.String(required=False, allow_none=True)
+    userId = fields.Integer(required=True, allow_none=False)
+    userName = fields.String(required=True, allow_none=False)
+    userImageBase64 = fields.String(required=False, allow_none=True)
+    defaultPropertyId = fields.Integer(required=True, allow_none=False)
+    defaultPropertyName = fields.String(required=True, allow_none=False)
diff --git a/pms_api_rest/services/pms_login_service.py b/pms_api_rest/services/pms_login_service.py
index a719cc187..281c5ab53 100644
--- a/pms_api_rest/services/pms_login_service.py
+++ b/pms_api_rest/services/pms_login_service.py
@@ -52,4 +52,12 @@ class PmsLoginService(Component):
             key="pms_secret_key_example",
             algorithm=jwt.ALGORITHMS.HS256,
         )
-        return PmsApiRestUserOutput(token=token)
+
+        return PmsApiRestUserOutput(
+            token=token,
+            userId=user_record.id,
+            userName=user_record.name,
+            defaultPropertyId=user_record.pms_property_id.id,
+            defaultPropertyName=user_record.pms_property_id.name,
+            userImageBase64=user_record.partner_id.image_1024,
+        )