diff --git a/BCS.BMC/src/BCS.BMC.Web.Core/Controllers/TokenAuthController.cs b/BCS.BMC/src/BCS.BMC.Web.Core/Controllers/TokenAuthController.cs
index bc6fd72..d3773f6 100644
--- a/BCS.BMC/src/BCS.BMC.Web.Core/Controllers/TokenAuthController.cs
+++ b/BCS.BMC/src/BCS.BMC.Web.Core/Controllers/TokenAuthController.cs
@@ -323,7 +323,7 @@ namespace BCS.BMC.Controllers
                 {
                     var responseStream = await response.Content.ReadAsStringAsync();
                     LoginOrRegisterResponseMessageModel result = JsonConvert.DeserializeObject<LoginOrRegisterResponseMessageModel>(responseStream);
-
+                    result.result.CompanyId = company.Id.ToString();
 
                     var getTokenDetails = _firebaseToken.GetAllList().Where(x => x.HostName == host && x.UserId == int.Parse(result.result.userId)).FirstOrDefault();
                     if (getTokenDetails is null)
@@ -388,6 +388,7 @@ namespace BCS.BMC.Controllers
                 {
                     var responseStream = await response.Content.ReadAsStringAsync();
                     LoginOrRegisterResponseMessageModel result = JsonConvert.DeserializeObject<LoginOrRegisterResponseMessageModel>(responseStream);
+                    result.result.CompanyId = company.Id.ToString();
                     return Ok(result);
                 }
                 else if (response.StatusCode == HttpStatusCode.InternalServerError)
diff --git a/BCS.BMC/src/BCS.BMC.Web.Core/Models/TokenAuth/LoginOrRegisterResponseMessageModel.cs b/BCS.BMC/src/BCS.BMC.Web.Core/Models/TokenAuth/LoginOrRegisterResponseMessageModel.cs
index 35ee838..a3dee46 100644
--- a/BCS.BMC/src/BCS.BMC.Web.Core/Models/TokenAuth/LoginOrRegisterResponseMessageModel.cs
+++ b/BCS.BMC/src/BCS.BMC.Web.Core/Models/TokenAuth/LoginOrRegisterResponseMessageModel.cs
@@ -23,6 +23,7 @@ namespace BCS.BMC.Models.TokenAuth
         public string employeeId { get; set; }
         public string phoneNo { get; set; }
         public string profilePictureId { get; set; }
+        public string CompanyId { get; set; }
 
     }
 }