diff --git a/api/controllers/console/auth/forgot_password.py b/api/controllers/console/auth/forgot_password.py
index 36f217087b..176fe6049f 100644
--- a/api/controllers/console/auth/forgot_password.py
+++ b/api/controllers/console/auth/forgot_password.py
@@ -2,7 +2,7 @@ import base64
 import logging
 import secrets
 
-from flask import redirect, request
+from flask import request
 from flask_restful import Resource, reqparse
 
 from configs import dify_config
@@ -15,7 +15,7 @@ from controllers.console.auth.error import (
     PasswordMismatchError,
     PasswordResetRateLimitExceededError,
 )
-from controllers.console.error import NotAllowedRegister
+from controllers.console.error import NotAllowedCreateWorkspace, NotAllowedRegister
 from controllers.console.setup import setup_required
 from events.tenant_event import tenant_was_created
 from extensions.ext_database import db
@@ -111,9 +111,7 @@ class ForgotPasswordResetApi(Resource):
             tenant = TenantService.get_join_tenants(account)
             if not tenant:
                 if not dify_config.ALLOW_CREATE_WORKSPACE:
-                    return redirect(
-                        f"{dify_config.CONSOLE_WEB_URL}/signin?message=Workspace not found, please contact system admin to invite you to join in a workspace."
-                    )
+                    return NotAllowedCreateWorkspace()
                 else:
                     tenant = TenantService.create_tenant(f"{account.name}'s Workspace")
                     TenantService.create_tenant_member(tenant, account, role="owner")
diff --git a/api/controllers/console/auth/login.py b/api/controllers/console/auth/login.py
index 8c2112e544..7c02a64909 100644
--- a/api/controllers/console/auth/login.py
+++ b/api/controllers/console/auth/login.py
@@ -14,7 +14,7 @@ from controllers.console.auth.error import (
     InvalidTokenError,
     PasswordMismatchError,
 )
-from controllers.console.error import NotAllowedRegister
+from controllers.console.error import NotAllowedCreateWorkspace, NotAllowedRegister
 from controllers.console.setup import setup_required
 from events.tenant_event import tenant_was_created
 from libs.helper import email, get_remote_ip
@@ -135,9 +135,7 @@ class EmailCodeLoginApi(Resource):
         tenant = TenantService.get_join_tenants(account)
         if not tenant:
             if not dify_config.ALLOW_CREATE_WORKSPACE:
-                return redirect(
-                    f"{dify_config.CONSOLE_WEB_URL}/signin?message=Workspace not found, please contact system admin to invite you to join in a workspace."
-                )
+                return NotAllowedCreateWorkspace()
             else:
                 tenant = TenantService.create_tenant(f"{account.name}'s Workspace")
                 TenantService.create_tenant_member(tenant, account, role="owner")