diff --git a/routers/org/org.go b/routers/org/org.go
index 665d1a71f..bb7540277 100644
--- a/routers/org/org.go
+++ b/routers/org/org.go
@@ -22,10 +22,6 @@ const (
 
 // Create render the page for create organization
 func Create(ctx *context.Context) {
-	if !ctx.User.CanCreateOrganization() {
-		ctx.NotFound("CanCreateOrganization", nil)
-	}
-
 	ctx.Data["Title"] = ctx.Tr("new_org")
 	if !ctx.User.CanCreateOrganization() {
 		ctx.ServerError("Not allowed", errors.New(ctx.Tr("org.form.create_org_not_allowed")))
@@ -36,12 +32,13 @@ func Create(ctx *context.Context) {
 
 // CreatePost response for create organization
 func CreatePost(ctx *context.Context, form auth.CreateOrgForm) {
+	ctx.Data["Title"] = ctx.Tr("new_org")
+
 	if !ctx.User.CanCreateOrganization() {
-		ctx.NotFound("CanCreateOrganization", nil)
+		ctx.ServerError("Not allowed", errors.New(ctx.Tr("org.form.create_org_not_allowed")))
+		return
 	}
 
-	ctx.Data["Title"] = ctx.Tr("new_org")
-
 	if ctx.HasError() {
 		ctx.HTML(200, tplCreateOrg)
 		return