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 cd3ada0..f09d849 100644
--- a/BCS.BMC/src/BCS.BMC.Web.Core/Controllers/TokenAuthController.cs
+++ b/BCS.BMC/src/BCS.BMC.Web.Core/Controllers/TokenAuthController.cs
@@ -352,7 +352,7 @@ namespace BCS.BMC.Controllers
                     var contents = await response.Content.ReadAsStringAsync();
                     ResponseMessageModel result = JsonConvert.DeserializeObject<ResponseMessageModel>(contents);
 
-                    return BadRequest(result.error.message == "Login Failed" ? "Invalid Username Or Password" : result.error.message);
+                    return BadRequest(result.error.message == "Login Failed" ? "Please enter valid Username or Password" : result.error.message);
                 }
                 return Ok();
             }
@@ -373,6 +373,11 @@ namespace BCS.BMC.Controllers
             {
                 return BadRequest("Url Not Found");
             }
+            var companyAccountId = await _companyMaster.FirstOrDefaultAsync(x => x.CompanyName == input.CompanyAccountId);
+            if (companyAccountId == null)
+            {
+                return BadRequest("Please enter valid Company Account ID");
+            }
             using (HttpClient client = new HttpClient())
             {
                 var baseUrl = input.CompanyUrl + "/api/services/bwac/employeeRegister/RegisterEmployeeAsNewUser";