diff --git a/app/authenticate/page.tsx b/app/authenticate/page.tsx
index f134728..de87198 100644
--- a/app/authenticate/page.tsx
+++ b/app/authenticate/page.tsx
@@ -298,7 +298,7 @@ export default function Page() {
                 setLoading(false);
                 return;
             }
-            UserAPI.checkEmail(email)
+            UserAPI.checkEmail(userInput)
             .then(r => {
                 setPageType(r ? "login" : "register")
                 if (!r) {
@@ -347,9 +347,11 @@ export default function Page() {
                     <Button
                         isLoading={loading}
                         disabled={
-                            disabled
+                            pageType !== 'wait-check' ? disabled : !policyState && isEmail || isPhone
+                        }
+                        color={
+                            pageType !== 'wait-check' ? buttonColor : policyState && isEmail || isPhone ? 'primary' : 'default'
                         }
-                        color={buttonColor}
                         onClick={handleClick()[pageType]}
                     >
                         {buttonMessage}
diff --git a/providers/http.ts b/providers/http.ts
index 51036d0..ed1eeb5 100644
--- a/providers/http.ts
+++ b/providers/http.ts
@@ -3,7 +3,7 @@ import axios, { AxiosError } from "axios";
 import cookie from 'react-cookies';
 
 export const http = axios.create({
-    baseURL: process.env.NODE_ENV === 'development' ? '/api' : process.env.NEXT_PUBLIC_API_SERVER,
+    baseURL: process.env.NEXT_PUBLIC_API_SERVER,
     timeout: 6000,
     withCredentials: true,
 });