diff --git a/templates/common/base.html b/templates/common/base.html
index da444d54..f203a48c 100644
--- a/templates/common/base.html
+++ b/templates/common/base.html
@@ -353,6 +353,8 @@ explicit grant from the SFTPGo Team (support@sftpgo.com).
 		});
 
         initLocalizer();
+        // Workaround to fix scrollbar in navigation sidebar.
+        window.dispatchEvent(new Event('resize'));
 	});
 </script>
 {{- end}}
diff --git a/templates/common/login.html b/templates/common/login.html
index e35fe382..45964f4b 100644
--- a/templates/common/login.html
+++ b/templates/common/login.html
@@ -77,7 +77,9 @@ explicit grant from the SFTPGo Team (support@sftpgo.com).
 								{{- end}}
 							</div>
 						</form>
+						{{- if or (.AltLoginURL) (gt (len .Languages) 1) (and .Branding.DisclaimerName .Branding.DisclaimerPath)}}
 						<hr>
+						{{- end}}
 						<div class="d-flex flex-stack pt-5 mt-3">
 							<div class="me-10">
 								<select id="languageSwitcher" name="language" class="form-select form-select-solid form-select-sm" data-control="i18n-select2" data-hide-search="true">
diff --git a/templates/webadmin/adminsetup.html b/templates/webadmin/adminsetup.html
index 5a83b327..8f9fe09e 100644
--- a/templates/webadmin/adminsetup.html
+++ b/templates/webadmin/adminsetup.html
@@ -93,7 +93,9 @@ explicit grant from the SFTPGo Team (support@sftpgo.com).
         </button>
     </div>
 </form>
+{{- if or (not .HideSupportLink) (gt (len .Languages) 1)}}
 <hr>
+{{- end}}
 <div class="d-flex flex-stack pt-5 mt-3">
     <div class="me-10">
         <select id="languageSwitcher" name="language" class="form-select form-select-solid form-select-sm" data-control="i18n-select2" data-hide-search="true"></select>
diff --git a/templates/webadmin/login.html b/templates/webadmin/login.html
deleted file mode 100644
index 62118b13..00000000
--- a/templates/webadmin/login.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<!--
-Copyright (C) 2023 Nicola Murino
-
-This WebUI uses the KeenThemes Mega Bundle, a proprietary theme:
-
-https://keenthemes.com/products/templates-mega-bundle
-
-KeenThemes HTML/CSS/JS components are allowed for use only within the
-SFTPGo product and restricted to be used in a resealable HTML template
-that can compete with KeenThemes products anyhow.
-
-This WebUI is allowed for use only within the SFTPGo product and
-therefore cannot be used in derivative works/products without an
-explicit grant from the SFTPGo Team (support@sftpgo.com).
--->
-{{- template "baselogin" .}}
-
-{{- define "content"}}
-                        <form class="form w-100" id="sign_in_form" action="{{.CurrentURL}}" method="POST">
-							<div class="container mb-10">
-								<div class="row align-items-center">
-									<div class="col-5 align-items-center">
-										<img alt="Logo" src="{{.StaticURL}}{{.Branding.LogoPath}}" class="h-80px h-md-90px h-lg-100px" />
-									</div>
-									<div class="col-7">
-										<h1 class="text-gray-900 mb-3 ms-3">
-											{{.Branding.ShortName}}
-										</h1>
-									</div>
-								</div>
-							</div>
-							{{- template "errmsg" .Error}}
-							{{- if not .FormDisabled}}
-							<div class="fv-row mb-10">
-								<input data-i18n="[placeholder]login.username" class="form-control form-control-lg form-control-solid" type="text" name="username" placeholder="Username" autocomplete="on" spellcheck="false" required />
-							</div>
-							<div class="fv-row mb-10">
-								<div class="position-relative" data-password-control="container">
-									<input data-i18n="[placeholder]login.password" data-password-control="input" class="form-control form-control-lg form-control-solid" type="password" name="password" placeholder="Password" autocomplete="current-password" spellcheck="false" required />
-									<span class="btn btn-sm btn-icon position-absolute translate-middle top-50 end-0 me-n2" data-password-control="visibility">
-                    					<i class="ki-duotone ki-eye-slash fs-1">
-											<span class="path1"></span>
-											<span class="path2"></span>
-											<span class="path3"></span>
-											<span class="path4"></span>
-										</i>
-                    					<i class="ki-duotone ki-eye d-none fs-1">
-											<span class="path1"></span>
-											<span class="path2"></span>
-											<span class="path3"></span>
-										</i>
-									</span>
-								</div>
-								<div class="d-flex justify-content-end mt-2">
-									{{- if .ForgotPwdURL}}
-									<a data-i18n="login.forgot_password" href="{{.ForgotPwdURL}}" class="link-primary fs-6 fw-bold">Forgot Password ?</a>
-									{{- end}}
-								</div>
-							</div>
-							{{- end}}
-							<div class="text-center">
-								{{- if not .FormDisabled}}
-								<input type="hidden" name="_form_token" value="{{.CSRFToken}}">
-								<button type="submit" id="sign_in_submit" class="btn btn-lg btn-primary w-100 mb-5">
-									<span data-i18n="login.signin" class="indicator-label">Sign in</span>
-									<span data-i18n="general.wait" class="indicator-progress">
-										Please wait...
-										<span class="spinner-border spinner-border-sm align-middle ms-2"></span>
-									</span>
-								</button>
-								{{- end}}
-								{{- if .OpenIDLoginURL}}
-								<a href="{{.OpenIDLoginURL}}" class="btn btn-flex btn-outline flex-center {{if .FormDisabled}}btn-primary{{else}}btn-active-color-primary bg-state-light{{end}} btn-lg w-100 my-5">
-									<img alt="Logo" src="{{.StaticURL}}/img/openid-logo.png" class="h-20px me-3" />
-									<span data-i18n="login.signin_openid">Sign in with OpenID</span>
-								</a>
-								{{- end}}
-							</div>
-						</form>
-						<hr>
-						<div class="d-flex flex-stack pt-5 mt-3">
-							<div class="me-10">
-								<select id="languageSwitcher" name="language" class="form-select form-select-solid form-select-sm" data-control="i18n-select2" data-hide-search="true">
-								</select>
-							</div>
-							<div class="d-flex fw-semibold text-primary">
-								{{- if .AltLoginURL}}
-								<a href="{{.AltLoginURL}}" class="px-2">
-									<span data-i18n="login.link" data-i18n-options='{ "link": "{{.AltLoginName}}" }'></span>
-								</a>
-								{{- end}}
-								{{- if and .Branding.DisclaimerName .Branding.DisclaimerPath}}
-								<a href="{{.Branding.DisclaimerPath}}" target="_blank" rel="noopener noreferrer" class="px-2">
-									<span data-i18n="custom.disclaimer_webclient">{{.Branding.DisclaimerName}}</span>
-								</a>
-								{{- end}}
-							</div>
-						</div>
-{{end}}
\ No newline at end of file
diff --git a/templates/webclient/sharelogin.html b/templates/webclient/sharelogin.html
index d37d92d9..eb9436b3 100644
--- a/templates/webclient/sharelogin.html
+++ b/templates/webclient/sharelogin.html
@@ -60,7 +60,9 @@ explicit grant from the SFTPGo Team (support@sftpgo.com).
         </button>
     </div>
 </form>
+{{- if gt (len .Languages) 1}}
 <hr>
+{{- end}}
 <div class=" d-flex flex-stack pt-5 mt-5">
     <div class="me-10">
         <select id="languageSwitcher" name="language" class="form-select form-select-solid form-select-sm" data-control="i18n-select2" data-hide-search="true">