From 3e3316f8254796f2532aaca445f9eb798d561740 Mon Sep 17 00:00:00 2001
From: Kerwin Bryant <kerwin612@qq.com>
Date: Sat, 17 May 2025 14:06:26 +0000
Subject: [PATCH] fix

---
 models/user/user.go             | 15 +++++++++++++++
 options/locale/locale_en-US.ini |  2 +-
 routers/install/install.go      |  4 ++--
 routers/web/auth/auth.go        |  4 +++-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/models/user/user.go b/models/user/user.go
index d7331d79f0..c3f082be05 100644
--- a/models/user/user.go
+++ b/models/user/user.go
@@ -831,6 +831,21 @@ type CountUserFilter struct {
 	IsActive       optional.Option[bool]
 }
 
+// HasUsers returns true if any user exists in the database.
+// It performs a much more efficient check than counting all users.
+func HasUsers(ctx context.Context) (bool, error) {
+	sess := db.GetEngine(ctx)
+	cond := builder.NewCond()
+	cond = cond.And(builder.Eq{"type": UserTypeIndividual})
+
+	exists, err := sess.Where(cond).Limit(1).Exist(new(User))
+	if err != nil {
+		return false, fmt.Errorf("error checking user existence: %w", err)
+	}
+
+	return exists, nil
+}
+
 // CountUsers returns number of users.
 func CountUsers(ctx context.Context, opts *CountUserFilter) int64 {
 	return countUsers(ctx, opts)
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 69aad0c5f3..cf3d574667 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -421,7 +421,7 @@ remember_me.compromised = The login token is not valid anymore which may indicat
 forgot_password_title= Forgot Password
 forgot_password = Forgot password?
 need_account = Need an account?
-sign_up_tip = You are registering the first account in the system. Upon successful registration, you will become the Super Administrator. Please carefully remember your username and password, as losing this information could cause significant inconvenience later.
+sign_up_tip = You are registering the first account in the system. Please carefully remember your username and password, as losing this information could cause significant inconvenience later.
 sign_up_now = Register now.
 sign_up_successful = Account was successfully created. Welcome!
 confirmation_mail_sent_prompt_ex = A new confirmation email has been sent to <b>%s</b>. Please check your inbox within the next %s to complete the registration process. If your registration email address is incorrect, you can sign in again and change it.
diff --git a/routers/install/install.go b/routers/install/install.go
index bd7810e809..68f402b210 100644
--- a/routers/install/install.go
+++ b/routers/install/install.go
@@ -558,8 +558,6 @@ func SubmitInstall(ctx *context.Context) {
 			}
 			log.Info("Admin account already exist")
 			u, _ = user_model.GetUserByName(ctx, u.Name)
-		} else {
-			ctx.Data["IsAccountCreated"] = true
 		}
 
 		nt, token, err := auth_service.CreateAuthTokenForUserID(ctx, u.ID)
@@ -609,5 +607,7 @@ func SubmitInstall(ctx *context.Context) {
 // InstallDone shows the "post-install" page, makes it easier to develop the page.
 // The name is not called as "PostInstall" to avoid misinterpretation as a handler for "POST /install"
 func InstallDone(ctx *context.Context) { //nolint
+	hasUsers, _ := user_model.HasUsers(ctx)
+	ctx.Data["IsAccountCreated"] = hasUsers
 	ctx.HTML(http.StatusOK, tplPostInstall)
 }
diff --git a/routers/web/auth/auth.go b/routers/web/auth/auth.go
index f07e821e01..bb9bb66f49 100644
--- a/routers/web/auth/auth.go
+++ b/routers/web/auth/auth.go
@@ -424,7 +424,9 @@ func SignUp(ctx *context.Context) {
 
 	ctx.Data["SignUpLink"] = setting.AppSubURL + "/user/sign_up"
 
-	ctx.Data["IsFirstTimeRegistration"] = user_model.CountUsers(ctx, nil) == 0
+	hasUsers, _ := user_model.HasUsers(ctx)
+
+	ctx.Data["IsFirstTimeRegistration"] = !hasUsers
 
 	oauth2Providers, err := oauth2.GetOAuth2Providers(ctx, optional.Some(true))
 	if err != nil {