diff --git a/controllers/organization.go b/controllers/organization.go
index 2062d28a..f3fc69a7 100644
--- a/controllers/organization.go
+++ b/controllers/organization.go
@@ -183,8 +183,6 @@ func (c *ApiController) DeleteOrganization() {
 func (c *ApiController) GetDefaultApplication() {
 	userId := c.GetSessionUsername()
 	id := c.Input().Get("id")
-	redirectUri := c.Input().Get("redirectUri")
-	typ := c.Input().Get("type")
 
 	application, err := object.GetDefaultApplication(id)
 	if err != nil {
@@ -192,14 +190,6 @@ func (c *ApiController) GetDefaultApplication() {
 		return
 	}
 
-	if typ == "cas" {
-		err = object.CheckCasRestrict(application, c.GetAcceptLanguage(), redirectUri)
-		if err != nil {
-			c.ResponseError(err.Error())
-			return
-		}
-	}
-
 	maskedApplication := object.GetMaskedApplication(application, userId)
 	c.ResponseOk(maskedApplication)
 }
diff --git a/object/token_cas.go b/object/token_cas.go
index 70651e21..ab9ab6e0 100644
--- a/object/token_cas.go
+++ b/object/token_cas.go
@@ -26,7 +26,6 @@ import (
 	"time"
 
 	"github.com/beevik/etree"
-	"github.com/casdoor/casdoor/i18n"
 	"github.com/casdoor/casdoor/util"
 	dsig "github.com/russellhaering/goxmldsig"
 )
@@ -123,13 +122,6 @@ var stToServiceResponse sync.Map
 // pgt is short for proxy granting ticket
 var pgtToServiceResponse sync.Map
 
-func CheckCasRestrict(application *Application, lang string, service string) error {
-	if len(application.RedirectUris) > 0 && !application.IsRedirectUriValid(service) {
-		return fmt.Errorf(i18n.Translate(lang, "token:Redirect URI: %s doesn't exist in the allowed Redirect URI list"), service)
-	}
-	return nil
-}
-
 func StoreCasTokenForPgt(token *CasAuthenticationSuccess, service, userId string) string {
 	pgt := fmt.Sprintf("PGT-%s", util.GenerateId())
 	pgtToServiceResponse.Store(pgt, &CasAuthenticationSuccessWrapper{
diff --git a/web/src/auth/LoginPage.js b/web/src/auth/LoginPage.js
index 93fe004b..b30b1870 100644
--- a/web/src/auth/LoginPage.js
+++ b/web/src/auth/LoginPage.js
@@ -173,12 +173,7 @@ class LoginPage extends React.Component {
           this.onUpdateApplication(res.data);
         });
     } else {
-      let redirectUri = "";
-      if (this.state.type === "cas") {
-        const casParams = Util.getCasParameters();
-        redirectUri = casParams.service;
-      }
-      OrganizationBackend.getDefaultApplication("admin", this.state.owner, this.state.type, redirectUri)
+      OrganizationBackend.getDefaultApplication("admin", this.state.owner)
         .then((res) => {
           if (res.status === "ok") {
             const application = res.data;
@@ -188,9 +183,9 @@ class LoginPage extends React.Component {
             });
           } else {
             this.onUpdateApplication(null);
-            this.setState({
-              msg: res.msg,
-            });
+            Setting.showMessage("error", res.msg);
+
+            this.props.history.push("/404");
           }
         });
     }
diff --git a/web/src/backend/OrganizationBackend.js b/web/src/backend/OrganizationBackend.js
index 20153146..d541b7a3 100644
--- a/web/src/backend/OrganizationBackend.js
+++ b/web/src/backend/OrganizationBackend.js
@@ -70,8 +70,8 @@ export function deleteOrganization(organization) {
   }).then(res => res.json());
 }
 
-export function getDefaultApplication(owner, name, type = "", redirectUri = "") {
-  return fetch(`${Setting.ServerUrl}/api/get-default-application?id=${owner}/${encodeURIComponent(name)}&type=${type}&redirectUri=${redirectUri}`, {
+export function getDefaultApplication(owner, name) {
+  return fetch(`${Setting.ServerUrl}/api/get-default-application?id=${owner}/${encodeURIComponent(name)}`, {
     method: "GET",
     credentials: "include",
     headers: {