3 files changed, 7 insertions, 6 deletions
diff --git a/internal/route/repo/pull.go b/internal/route/repo/pull.go
index 68389532..d65b1e10 100644
--- a/internal/route/repo/pull.go
+++ b/internal/route/repo/pull.go
@@ -135,7 +135,7 @@ func ForkPost(c *context.Context, f form.CreateRepo) {
 		c.Data["Err_RepoName"] = true
 		switch {
 		case db.IsErrReachLimitOfRepo(err):
-			c.RenderWithErr(c.Tr("repo.form.reach_limit_of_creation", c.User.RepoCreationNum()), FORK, &f)
+			c.RenderWithErr(c.Tr("repo.form.reach_limit_of_creation", err.(db.ErrReachLimitOfRepo).Limit), FORK, &f)
 		case db.IsErrRepoAlreadyExist(err):
 			c.RenderWithErr(c.Tr("repo.settings.new_owner_has_same_repo"), FORK, &f)
 		case db.IsErrNameNotAllowed(err):
diff --git a/internal/route/repo/repo.go b/internal/route/repo/repo.go
index c1fb327b..943540c8 100644
--- a/internal/route/repo/repo.go
+++ b/internal/route/repo/repo.go
@@ -86,10 +86,10 @@ func Create(c *context.Context) {
 	c.Success(CREATE)
 }
 
-func handleCreateError(c *context.Context, owner *db.User, err error, name, tpl string, form interface{}) {
+func handleCreateError(c *context.Context, err error, name, tpl string, form interface{}) {
 	switch {
 	case db.IsErrReachLimitOfRepo(err):
-		c.RenderWithErr(c.Tr("repo.form.reach_limit_of_creation", owner.RepoCreationNum()), tpl, form)
+		c.RenderWithErr(c.Tr("repo.form.reach_limit_of_creation", err.(db.ErrReachLimitOfRepo).Limit), tpl, form)
 	case db.IsErrRepoAlreadyExist(err):
 		c.Data["Err_RepoName"] = true
 		c.RenderWithErr(c.Tr("form.repo_name_been_taken"), tpl, form)
@@ -141,7 +141,7 @@ func CreatePost(c *context.Context, f form.CreateRepo) {
 		}
 	}
 
-	handleCreateError(c, ctxUser, err, "CreatePost", CREATE, &f)
+	handleCreateError(c, err, "CreatePost", CREATE, &f)
 }
 
 func Migrate(c *context.Context) {
@@ -227,7 +227,7 @@ func MigratePost(c *context.Context, f form.MigrateRepo) {
 		return
 	}
 
-	handleCreateError(c, ctxUser, err, "MigratePost", MIGRATE, &f)
+	handleCreateError(c, err, "MigratePost", MIGRATE, &f)
 }
 
 func Action(c *context.Context) {
diff --git a/internal/route/repo/setting.go b/internal/route/repo/setting.go
index 8c706981..a977fcc8 100644
--- a/internal/route/repo/setting.go
+++ b/internal/route/repo/setting.go
@@ -22,6 +22,7 @@ import (
 	"gogs.io/gogs/internal/form"
 	"gogs.io/gogs/internal/osutil"
 	"gogs.io/gogs/internal/tool"
+	"gogs.io/gogs/internal/userutil"
 )
 
 const (
@@ -269,7 +270,7 @@ func SettingsPost(c *context.Context, f form.RepoSetting) {
 		log.Trace("Repository deleted: %s/%s", c.Repo.Owner.Name, repo.Name)
 
 		c.Flash.Success(c.Tr("repo.settings.deletion_success"))
-		c.Redirect(c.Repo.Owner.DashboardLink())
+		c.Redirect(userutil.DashboardURLPath(c.Repo.Owner.Name, c.Repo.Owner.IsOrganization()))
 
 	case "delete-wiki":
 		if !c.Repo.IsOwner() {