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 d3773f6..d2208be 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();
+                    result.result.CompanyId = company.Id;
 
                     var getTokenDetails = _firebaseToken.GetAllList().Where(x => x.HostName == host && x.UserId == int.Parse(result.result.userId)).FirstOrDefault();
                     if (getTokenDetails is null)
@@ -388,7 +388,7 @@ namespace BCS.BMC.Controllers
                 {
                     var responseStream = await response.Content.ReadAsStringAsync();
                     LoginOrRegisterResponseMessageModel result = JsonConvert.DeserializeObject<LoginOrRegisterResponseMessageModel>(responseStream);
-                    result.result.CompanyId = company.Id.ToString();
+                    result.result.CompanyId = company.Id;
                     return Ok(result);
                 }
                 else if (response.StatusCode == HttpStatusCode.InternalServerError)
diff --git a/BCS.BMC/src/BCS.BMC.Web.Core/Models/TokenAuth/LoginInputModel.cs b/BCS.BMC/src/BCS.BMC.Web.Core/Models/TokenAuth/LoginInputModel.cs
index af52824..12fcc53 100644
--- a/BCS.BMC/src/BCS.BMC.Web.Core/Models/TokenAuth/LoginInputModel.cs
+++ b/BCS.BMC/src/BCS.BMC.Web.Core/Models/TokenAuth/LoginInputModel.cs
@@ -9,7 +9,7 @@ namespace BCS.BMC.Models.TokenAuth
     public class LoginInputModel
     {
         public string CompanyUrl { get; set; }
-        public string CompanyId { get; set; }
+        public int? CompanyId { get; set; }
         public string UsernameOrEmailAddress { get; set; }
         public string Password { get; set; }
         public string FcmToken { get; set; }
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 a3dee46..ab12160 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,7 +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; }
+        public int? CompanyId { get; set; }
 
     }
 }
diff --git a/BCS.BMC/src/BCS.BMC.Web.Core/Models/TokenAuth/RegistrationInput.cs b/BCS.BMC/src/BCS.BMC.Web.Core/Models/TokenAuth/RegistrationInput.cs
index 671cf37..44841b3 100644
--- a/BCS.BMC/src/BCS.BMC.Web.Core/Models/TokenAuth/RegistrationInput.cs
+++ b/BCS.BMC/src/BCS.BMC.Web.Core/Models/TokenAuth/RegistrationInput.cs
@@ -8,7 +8,7 @@ namespace BCS.BMC.Models.TokenAuth
 {
     public class RegistrationInput
     {      
-        public string CompanyAccountId { get; set; }
+        public int? CompanyAccountId { get; set; }
         public string UserNameOrEmail { get; set; }
         public string Phoneno { get; set; }
         public string Password { get; set; }