diff --git a/routers/web/admin/branding.go b/routers/web/admin/branding.go
index 2e4c038c47..48919ec8f5 100644
--- a/routers/web/admin/branding.go
+++ b/routers/web/admin/branding.go
@@ -29,7 +29,7 @@ func Branding(ctx *context.Context) {
 
 	imgDir := brandingImageDir()
 	ctx.Data["HasNavIcon"] = fileExists(filepath.Join(imgDir, "logo-small.png"))
-	ctx.Data["HasLogo"] = fileExists(filepath.Join(imgDir, "logo.png"))
+	ctx.Data["HasLoginLogo"] = fileExists(filepath.Join(imgDir, "login-logo.png"))
 	ctx.Data["HasFavicon"] = fileExists(filepath.Join(imgDir, "favicon.png"))
 
 	ctx.Data["MetaDescription"] = setting.UI.Meta.Description
@@ -105,8 +105,8 @@ func BrandingUpload(ctx *context.Context) {
 	switch imageType {
 	case "nav-icon":
 		filename = "logo-small.png"
-	case "logo":
-		filename = "logo.png"
+	case "login-logo":
+		filename = "login-logo.png"
 	case "favicon":
 		filename = "favicon.png"
 	default:
@@ -173,8 +173,8 @@ func BrandingReset(ctx *context.Context) {
 	switch imageType {
 	case "nav-icon":
 		filename = "logo-small.png"
-	case "logo":
-		filename = "logo.png"
+	case "login-logo":
+		filename = "login-logo.png"
 	case "favicon":
 		filename = "favicon.png"
 	default:
diff --git a/templates/admin/branding.tmpl b/templates/admin/branding.tmpl
index 38ba384508..819075e1ce 100644
--- a/templates/admin/branding.tmpl
+++ b/templates/admin/branding.tmpl
@@ -73,20 +73,20 @@
 					<!-- Login Logo -->
 					<tr>
 						<td>
-							<strong>Login Logo</strong> {{if .HasLogo}}<span class="ui mini green label">Custom</span>{{else}}<span class="ui mini grey label">Default</span>{{end}}
-							<div class="tw-text-text-light tw-text-sm tw-mt-1">Login page and homepage. Wide format, max 220px display.</div>
+							<strong>Login Logo</strong> {{if .HasLoginLogo}}<span class="ui mini green label">Custom</span>{{else}}<span class="ui mini grey label">None</span>{{end}}
+							<div class="tw-text-text-light tw-text-sm tw-mt-1">Login page and homepage. Wide format, max 220px. Hidden when not set.</div>
 						</td>
 						<td>
 							<form method="post" action="{{AppSubUrl}}/-/admin/branding/upload" enctype="multipart/form-data">
 								{{.CsrfTokenHtml}}
-								<input type="hidden" name="type" value="logo">
+								<input type="hidden" name="type" value="login-logo">
 								<input type="file" name="file" accept="image/png,image/svg+xml" required class="tw-mb-2" style="max-width: 100%;">
 								<br><button type="submit" class="ui primary mini button">{{svg "octicon-upload" 12}} Upload</button>
-								{{if .HasLogo}}<a href="{{AppSubUrl}}/-/admin/branding/reset?type=logo" class="ui mini button tw-ml-2">{{svg "octicon-sync" 12}} Reset</a>{{end}}
+								{{if .HasLoginLogo}}<a href="{{AppSubUrl}}/-/admin/branding/reset?type=login-logo" class="ui mini button tw-ml-2">{{svg "octicon-sync" 12}} Reset</a>{{end}}
 							</form>
 						</td>
 						<td class="tw-text-center" style="background: var(--color-secondary); border-radius: var(--border-radius);">
-							<img src="{{AssetUrlPrefix}}/img/logo.png?v={{ctx.CspScriptNonce}}" style="max-height: 48px; max-width: 140px; object-fit: contain;">
+							{{if .HasLoginLogo}}<img src="{{AssetUrlPrefix}}/img/login-logo.png?v={{ctx.CspScriptNonce}}" style="max-height: 48px; max-width: 140px; object-fit: contain;">{{else}}<span class="tw-text-text-light">Not set</span>{{end}}
 						</td>
 					</tr>
 
diff --git a/templates/home.tmpl b/templates/home.tmpl
index 43056e1891..7e9717d269 100644
--- a/templates/home.tmpl
+++ b/templates/home.tmpl
@@ -2,7 +2,7 @@
 <div role="main" aria-label="{{if .IsSigned}}{{ctx.Locale.Tr "dashboard"}}{{else}}{{ctx.Locale.Tr "home_title"}}{{end}}" class="page-content home">
 	<div class="tw-mb-8 tw-px-8">
 		<div class="center">
-			<img class="logo" width="220" height="220" src="{{AssetUrlPrefix}}/img/logo.png" alt="{{ctx.Locale.Tr "logo"}}">
+			<img class="logo" width="220" height="220" src="{{AssetUrlPrefix}}/img/login-logo.png" alt="{{ctx.Locale.Tr "logo"}}" onerror="this.style.display='none'">
 			<div class="hero">
 				<h1 class="ui icon header title tw-text-balance">
 					{{AppName}}