diff --git a/AccountManagement.Application.Contracts/Account/Login.cs b/AccountManagement.Application.Contracts/Account/Login.cs
index bc772164..c8287124 100644
--- a/AccountManagement.Application.Contracts/Account/Login.cs
+++ b/AccountManagement.Application.Contracts/Account/Login.cs
@@ -4,4 +4,5 @@ public class Login
 {
     public string Username { get; set; }
     public string Password { get; set; }
+
 }
\ No newline at end of file
diff --git a/ServiceHost/Pages/Index.cshtml b/ServiceHost/Pages/Index.cshtml
index 7a630af2..6bc52348 100644
--- a/ServiceHost/Pages/Index.cshtml
+++ b/ServiceHost/Pages/Index.cshtml
@@ -123,6 +123,7 @@
                             </p>
 
                         </div>
+                        <input type="hidden" asp-for="CaptchaResponse" id="captchaRes" value="" />
                     </form>
                 </div>
 
@@ -293,7 +294,7 @@
 
 
 @section Script{
-  @*   <script src="https://www.google.com/recaptcha/api.js?hl=fa&render=6Lfhp_AnAAAAAB79WkrMoHd1k8ir4m8VvfjE7FTH"></script> *@
+    <script src="https://www.google.com/recaptcha/api.js?hl=fa&render=6Lfhp_AnAAAAAB79WkrMoHd1k8ir4m8VvfjE7FTH"></script>
     <script>'serviceWorker' in navigator && navigator.serviceWorker.register('/serviceworker')</script>
 	<script>
 		// if ('serviceWorker' in navigator) {
@@ -362,6 +363,15 @@
 		// }
 	</script>
     <script>
+        window.grecaptcha.ready(function () {
+            window.grecaptcha.execute('6Lfhp_AnAAAAAB79WkrMoHd1k8ir4m8VvfjE7FTH', { action: 'submit' }).then(function (response) {
+                console.log(response);
+
+                $('#captchaRes').val(response);
+
+
+            });
+        });
         function captchaCheck() {
             window.grecaptcha.ready(function() {
                window.grecaptcha.execute('6Lfhp_AnAAAAAB79WkrMoHd1k8ir4m8VvfjE7FTH', { action: 'submit' }).then(function(response) {
diff --git a/ServiceHost/Pages/Index.cshtml.cs b/ServiceHost/Pages/Index.cshtml.cs
index b9d086d5..bfff1760 100644
--- a/ServiceHost/Pages/Index.cshtml.cs
+++ b/ServiceHost/Pages/Index.cshtml.cs
@@ -22,8 +22,10 @@ namespace ServiceHost.Pages
 		public string Username { get; set; }
 		[BindProperty]
 		public string Password { get; set; }
+        [BindProperty]
+        public string CaptchaResponse { get; set; }
 
-		private static Timer aTimer;
+        private static Timer aTimer;
 		public Login login;
 		public AccountViewModel Search;
 		private readonly ILogger<IndexModel> _logger;
@@ -33,7 +35,8 @@ namespace ServiceHost.Pages
 		private readonly IWorker _worker;
 		private readonly IAuthHelper _authHelper;
 		private readonly ICameraAccountApplication _cameraAccountApplication;
-		public IndexModel(ILogger<IndexModel> logger, IAccountApplication accountApplication, IGoogleRecaptcha googleRecaptcha, ISmsService smsService, IWorker worker, IAuthHelper authHelper, ICameraAccountApplication cameraAccountApplication)
+        private readonly IWebHostEnvironment _webHostEnvironment;
+		public IndexModel(ILogger<IndexModel> logger, IAccountApplication accountApplication, IGoogleRecaptcha googleRecaptcha, ISmsService smsService, IWorker worker, IAuthHelper authHelper, ICameraAccountApplication cameraAccountApplication, IWebHostEnvironment webHostEnvironment)
 		{
 			_logger = logger;
 			_accountApplication = accountApplication;
@@ -42,7 +45,8 @@ namespace ServiceHost.Pages
 			_worker = worker;
 			_authHelper = authHelper;
 			_cameraAccountApplication = cameraAccountApplication;
-		}
+            _webHostEnvironment = webHostEnvironment;
+        }
 
 		public IActionResult OnGet()
 		{
@@ -81,30 +85,46 @@ namespace ServiceHost.Pages
 		}
 
 		public IActionResult OnPostEnter(Login command)
-		{
-			var result = _accountApplication.Login(command);
-			if (result.IsSuccedded)
-			{
-				switch (result.SendId)
-				{
-					case 1:
-						return Redirect("/Admin");
-						break;
-					case 2:
-						return Redirect("/Client");
-						break;
-					case 3:
-						return Redirect("/Camera");
-						break;
-					case 0:
-						result.Message = "امکان ورود با این حساب کاربری وجود ندارد";
-						break;
-				}
-			}
+        {
+
+            bool captchaResult = true;
+            if (!_webHostEnvironment.IsDevelopment())
+                captchaResult = _googleRecaptcha.IsSatisfy(CaptchaResponse).Result;
+            
+           
+            if (captchaResult)
+            {
+                var result = _accountApplication.Login(command);
+                if (result.IsSuccedded)
+                {
+                    switch (result.SendId)
+                    {
+                        case 1:
+                            return Redirect("/Admin");
+                            break;
+                        case 2:
+                            return Redirect("/Client");
+                            break;
+                        case 3:
+                            return Redirect("/Camera");
+                            break;
+                        case 0:
+                            result.Message = "امکان ورود با این حساب کاربری وجود ندارد";
+                            break;
+                    }
+                }
+
+                Mess = result.Message;
+            }
+            else
+            {
+                Mess = "دستگاه شما ربات تشخیص داده شد";
+            }
+           
 
 
 			//ModelState.AddModelError("Username", "اطلاعات وارد شده اشتباه است");
-			Mess = result.Message;
+			
 			return Page();
 		}
 
@@ -179,31 +199,43 @@ namespace ServiceHost.Pages
 
 		public IActionResult OnPostWithMobile(string code, string phone)
 		{
-			var verfiyResult = _accountApplication.GetByVerifyCode(code, phone);
-			if (verfiyResult != null)
-			{
+            bool captchaResult = true;
+            if (!_webHostEnvironment.IsDevelopment())
+                captchaResult = _googleRecaptcha.IsSatisfy(CaptchaResponse).Result;
+            if (captchaResult)
+            {
+                var verfiyResult = _accountApplication.GetByVerifyCode(code, phone);
+                if (verfiyResult != null)
+                {
 
-				var result = _accountApplication.LoginWithMobile(verfiyResult.Id);
-				if (result.IsSuccedded && result.SendId == 1)
-				{
-					return new JsonResult(new
-					{
-						exist = true,
-						url = "/Admin",
-					});
-				}
+                    var result = _accountApplication.LoginWithMobile(verfiyResult.Id);
+                    if (result.IsSuccedded && result.SendId == 1)
+                    {
+                        return new JsonResult(new
+                        {
+                            exist = true,
+                            url = "/Admin",
+                        });
+                    }
 
 
-				if (result.IsSuccedded && result.SendId == 2)
-				{
-					return new JsonResult(new
-					{
-						exist = true,
-						url = "/Client",
-					});
-				}
+                    if (result.IsSuccedded && result.SendId == 2)
+                    {
+                        return new JsonResult(new
+                        {
+                            exist = true,
+                            url = "/Client",
+                        });
+                    }
 
-			}
+                }
+            }
+            else
+            {
+                Mess = "دستگاه شما ربات تشخیص داده شد";
+            }
+
+        
 
 			return new JsonResult(new
 			{