diff --git a/admin_frontend/templates/login.html b/admin_frontend/templates/login.html
index e0fa2fd8..438c61ed 100644
--- a/admin_frontend/templates/login.html
+++ b/admin_frontend/templates/login.html
@@ -27,7 +27,7 @@
 
     <div id="oauth2Login">
       <p>Or login with:</p>
-      <a href="/authorize?provider=google&redirect_to=/web/login">Google</a>
+      <a href="/gotrue/authorize?provider=google&redirect_to=/web/login">Google</a>
     </div>
 
     <script>
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index 2b65f9e4..9020eddb 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -18,8 +18,9 @@ http {
         listen 80;
         listen 443 ssl;
 
-        # GoTrue
-        location ~ ^/(verify|authorize|callback|settings|user|token|admin) {
+	# GoTrue
+	location /gotrue/ {
+	    rewrite ^/gotrue(/.*)$ $1 break;
             proxy_pass http://gotrue:9999;
         }
 
diff --git a/tests/main.rs b/tests/main.rs
index f4396cf0..3fbc902e 100644
--- a/tests/main.rs
+++ b/tests/main.rs
@@ -22,7 +22,7 @@ pub fn localhost_client() -> Client {
 
 pub const DEV_URL: &str = "https://test.appflowy.cloud";
 pub const DEV_WS: &str = "wss://test.appflowy.cloud/ws";
-pub const DEV_GOTRUE: &str = "https://test.appflowy.cloud";
+pub const DEV_GOTRUE: &str = "https://test.appflowy.cloud/gotrue";
 
 #[allow(dead_code)]
 pub fn test_appflowy_cloud_client() -> Client {