diff --git a/Source/src/app.php b/Source/src/app.php
index fb78489..46abec8 100644
--- a/Source/src/app.php
+++ b/Source/src/app.php
@@ -143,12 +143,7 @@ $app->get('/login', function(Request $request) use ($app){
     }
     else{
         $state = checkInfo($request);
-        $captcha = checkCaptcha($request->get("g-recaptcha-response"));
-        if($captcha)
-            return loginOrRegister($state,$request);
-        else{
-            return "CAPTCHA_FAIL";
-        }
+        return loginOrRegister($state,$request);
     }
 
 })->bind('login')->method('GET|POST');
@@ -164,12 +159,7 @@ $app->get('/signup', function(Request $request) use ($app){
         return loginRegister('sign-up');
     }else{
         $state = checkInfo($request);
-        $captcha = checkCaptcha($request->get("g-recaptcha-response"));
-        if($captcha)
-            return loginOrRegister($state,$request);
-        else{
-            return "CAPTCHA_FAIL";
-        }
+        return loginOrRegister($state,$request);
     }
 
 })->bind('register')->method('GET|POST');
@@ -203,6 +193,11 @@ function loginOrRegister($state,$request){
                 return loginRegister("login",'BAD_CREDENTIAL');
             }
         case 2:
+            $captcha = checkCaptcha($request->get("g-recaptcha-response"));
+            if(!$captcha){
+                return "CAPTCHA_FAIL";
+            }
+
             $state = register($request->get('emailre'),$request->get('emailre-re'),
             $request->get('pwdre'),  $request->get('pwdre-re'),$request->get('nick'),$app['data']);
             if ($state == '')