diff --git a/internal/httpd/web.go b/internal/httpd/web.go
index ea3d25b2..bdaf233c 100644
--- a/internal/httpd/web.go
+++ b/internal/httpd/web.go
@@ -48,6 +48,7 @@ const (
 	templateResetPassword      = "reset-password.html"
 	templateCommonCSS          = "sftpgo.css"
 	templateCommonBase         = "base.html"
+	templateCommonBaseLogin    = "baselogin.html"
 )
 
 var (
diff --git a/internal/httpd/webclient.go b/internal/httpd/webclient.go
index b5f4dbed..1f1233ba 100644
--- a/internal/httpd/webclient.go
+++ b/internal/httpd/webclient.go
@@ -47,7 +47,6 @@ import (
 const (
 	templateClientDir               = "webclient"
 	templateClientBase              = "base.html"
-	templateClientBaseLogin         = "baselogin.html"
 	templateClientLogin             = "login.html"
 	templateClientFiles             = "files.html"
 	templateClientMessage           = "message.html"
@@ -481,7 +480,7 @@ func loadClientTemplates(templatesPath string) {
 	}
 	loginPath := []string{
 		filepath.Join(templatesPath, templateCommonDir, templateCommonBase),
-		filepath.Join(templatesPath, templateClientDir, templateClientBaseLogin),
+		filepath.Join(templatesPath, templateCommonDir, templateBaseLogin),
 		filepath.Join(templatesPath, templateClientDir, templateClientLogin),
 	}
 	messagePath := []string{
@@ -496,22 +495,22 @@ func loadClientTemplates(templatesPath string) {
 	}
 	twoFactorPath := []string{
 		filepath.Join(templatesPath, templateCommonDir, templateCommonBase),
-		filepath.Join(templatesPath, templateClientDir, templateClientBaseLogin),
+		filepath.Join(templatesPath, templateCommonDir, templateBaseLogin),
 		filepath.Join(templatesPath, templateClientDir, templateClientTwoFactor),
 	}
 	twoFactorRecoveryPath := []string{
 		filepath.Join(templatesPath, templateCommonDir, templateCommonBase),
-		filepath.Join(templatesPath, templateClientDir, templateClientBaseLogin),
+		filepath.Join(templatesPath, templateCommonDir, templateBaseLogin),
 		filepath.Join(templatesPath, templateClientDir, templateClientTwoFactorRecovery),
 	}
 	forgotPwdPaths := []string{
 		filepath.Join(templatesPath, templateCommonDir, templateCommonBase),
-		filepath.Join(templatesPath, templateClientDir, templateClientBaseLogin),
+		filepath.Join(templatesPath, templateCommonDir, templateBaseLogin),
 		filepath.Join(templatesPath, templateClientDir, templateForgotPassword),
 	}
 	resetPwdPaths := []string{
 		filepath.Join(templatesPath, templateCommonDir, templateCommonBase),
-		filepath.Join(templatesPath, templateClientDir, templateClientBaseLogin),
+		filepath.Join(templatesPath, templateCommonDir, templateBaseLogin),
 		filepath.Join(templatesPath, templateClientDir, templateResetPassword),
 	}
 	viewPDFPaths := []string{
@@ -520,7 +519,7 @@ func loadClientTemplates(templatesPath string) {
 	}
 	shareLoginPath := []string{
 		filepath.Join(templatesPath, templateCommonDir, templateCommonBase),
-		filepath.Join(templatesPath, templateClientDir, templateClientBaseLogin),
+		filepath.Join(templatesPath, templateCommonDir, templateBaseLogin),
 		filepath.Join(templatesPath, templateClientDir, templateShareLogin),
 	}
 	shareUploadPath := []string{
diff --git a/templates/webclient/baselogin.html b/templates/common/baselogin.html
similarity index 100%
rename from templates/webclient/baselogin.html
rename to templates/common/baselogin.html