diff --git a/docs/full-configuration.md b/docs/full-configuration.md
index e0485bbf4e5307cba0cc649ba968ff8f7aee7c39..991eff1536498b8c9e07e04534ab4b76ee9b9601 100644
--- a/docs/full-configuration.md
+++ b/docs/full-configuration.md
@@ -274,7 +274,7 @@ The configuration file contains the following sections:
       - `expect_ct_header`, string. Allows to set the `Expect-CT` header value. Default: blank.
     - `branding`, struct. Defines the supported customizations to suit your brand. It contains the `web_admin` and `web_client` structs that define customizations for the WebAdmin and the WebClient UIs. Each customization struct contains the following fields:
       - `name`, string. Defines the UI name
-      - `short_name`, string. Define the short name to show next to the logo image
+      - `short_name`, string. Defines the short name to show next to the logo image and on the login page
       - `favicon_path`, string. Path to the favicon relative to `static_files_path`. For example, if you create a directory named `branding` inside the static dir and put the `favicon.ico` file in it, you must set `/branding/favicon.ico` as path.
       - `logo_path`, string. Path to your logo relative to `static_files_path`. The preferred image size is 256x256 pixel
       - `login_image_path`, string. Path to a custom image to show on the login screen relative to `static_files_path`. The preferred image size is 900x900 pixel
diff --git a/httpd/server.go b/httpd/server.go
index ca410e51d230136e36882923121a82afcb8893d9..035a92871756ab3aa8d6fe83c0943d8e37f96c64 100644
--- a/httpd/server.go
+++ b/httpd/server.go
@@ -144,6 +144,7 @@ func (s *httpdServer) renderClientLoginPage(w http.ResponseWriter, error, ip str
 	}
 	if s.binding.showAdminLoginURL() {
 		data.AltLoginURL = webAdminLoginPath
+		data.AltLoginName = s.binding.Branding.WebAdmin.ShortName
 	}
 	if smtp.IsEnabled() {
 		data.ForgotPwdURL = webClientForgotPwdPath
@@ -520,6 +521,7 @@ func (s *httpdServer) renderAdminLoginPage(w http.ResponseWriter, error, ip stri
 	}
 	if s.binding.showClientLoginURL() {
 		data.AltLoginURL = webClientLoginPath
+		data.AltLoginName = s.binding.Branding.WebClient.ShortName
 	}
 	if smtp.IsEnabled() {
 		data.ForgotPwdURL = webAdminForgotPwdPath
diff --git a/httpd/web.go b/httpd/web.go
index 6498592edfdc5b717c55ff61642b4473392a4e68..67785ddf1ae8e73638710d2d14ce9063fb7589da 100644
--- a/httpd/web.go
+++ b/httpd/web.go
@@ -31,6 +31,7 @@ type loginPage struct {
 	CSRFToken      string
 	StaticURL      string
 	AltLoginURL    string
+	AltLoginName   string
 	ForgotPwdURL   string
 	OpenIDLoginURL string
 	Branding       UIBranding
diff --git a/templates/webadmin/login.html b/templates/webadmin/login.html
index 698df4cb22018528d3890d405b7866f261a3545d..96bf22530594e813c38f57f726c7cd895e0ae571 100644
--- a/templates/webadmin/login.html
+++ b/templates/webadmin/login.html
@@ -4,7 +4,7 @@
 
 {{define "content"}}
                                     <div class="text-center">
-                                        <h1 class="h4 text-gray-900 mb-4">{{.Branding.Name}} - {{.Version}}</h1>
+                                        <h1 class="h4 text-gray-900 mb-4">{{.Branding.ShortName}} - {{.Version}}</h1>
                                     </div>
                                     {{if .Error}}
                                     <div class="card mb-4 border-left-warning">
@@ -40,7 +40,7 @@
                                     {{if .AltLoginURL}}
                                     <hr>
                                     <div class="text-center">
-                                        <a class="small" href="{{.AltLoginURL}}">Web Client</a>
+                                        <a class="small" href="{{.AltLoginURL}}">{{.AltLoginName}}</a>
                                     </div>
                                     {{end}}
                                     {{if and .Branding.DisclaimerName .Branding.DisclaimerPath}}
diff --git a/templates/webclient/baselogin.html b/templates/webclient/baselogin.html
index 8fe5a09ab3b8ccf59d11b8b4832dac0f9e472221..0614ce5208136957b568d3fa294e626ba6f00093 100644
--- a/templates/webclient/baselogin.html
+++ b/templates/webclient/baselogin.html
@@ -48,7 +48,7 @@
                             <div class="col-lg-7">
                                 <div class="p-5">
                                     <div class="text-center">
-                                        <h1 class="h4 text-gray-900 mb-4">{{.Branding.Name}} - {{.Version}}</h1>
+                                        <h1 class="h4 text-gray-900 mb-4">{{.Branding.ShortName}} - {{.Version}}</h1>
                                     </div>
                                     {{template "content" .}}
                                 </div>
diff --git a/templates/webclient/login.html b/templates/webclient/login.html
index b8403bdcd1ea0d556486b2bf826eda5038fdbcc0..78bff865b74a8ae4ccadbcf162b0b2eca9b5fdac 100644
--- a/templates/webclient/login.html
+++ b/templates/webclient/login.html
@@ -37,7 +37,7 @@
                                     {{if .AltLoginURL}}
                                     <hr>
                                     <div class="text-center">
-                                        <a class="small" href="{{.AltLoginURL}}">Web Admin</a>
+                                        <a class="small" href="{{.AltLoginURL}}">{{.AltLoginName}}</a>
                                     </div>
                                     {{end}}
                                     {{if and .Branding.DisclaimerName .Branding.DisclaimerPath}}
diff --git a/vfs/azblobfs.go b/vfs/azblobfs.go
index 2cd55cbb2d95ae86563a1647568ec3be78a5c19a..ebbdd1203cb808637ab1a1dbfbfe74a3fabb2e4a 100644
--- a/vfs/azblobfs.go
+++ b/vfs/azblobfs.go
@@ -766,7 +766,7 @@ func (*AzureBlobFs) Close() error {
 	return nil
 }
 
-// GetAvailableDiskSize return the available size for the specified path
+// GetAvailableDiskSize returns the available size for the specified path
 func (*AzureBlobFs) GetAvailableDiskSize(dirName string) (*sftp.StatVFS, error) {
 	return nil, ErrStorageSizeUnavailable
 }
diff --git a/vfs/gcsfs.go b/vfs/gcsfs.go
index 9ab17f643ab3eb96fb9bd17687508c59cc7bba76..05f3e61acec1456ef46959c5f5cbcba5e7aba9d3 100644
--- a/vfs/gcsfs.go
+++ b/vfs/gcsfs.go
@@ -831,7 +831,7 @@ func (fs *GCSFs) Close() error {
 	return nil
 }
 
-// GetAvailableDiskSize return the available size for the specified path
+// GetAvailableDiskSize returns the available size for the specified path
 func (*GCSFs) GetAvailableDiskSize(dirName string) (*sftp.StatVFS, error) {
 	return nil, ErrStorageSizeUnavailable
 }
diff --git a/vfs/osfs.go b/vfs/osfs.go
index ea2541adb8a4eed26f900ec645f21d283b513942..891c1ebef94c36f054088a5cd06c01dc3bcc34a0 100644
--- a/vfs/osfs.go
+++ b/vfs/osfs.go
@@ -448,7 +448,7 @@ func (*OsFs) Close() error {
 	return nil
 }
 
-// GetAvailableDiskSize return the available size for the specified path
+// GetAvailableDiskSize returns the available size for the specified path
 func (*OsFs) GetAvailableDiskSize(dirName string) (*sftp.StatVFS, error) {
 	return getStatFS(dirName)
 }
diff --git a/vfs/s3fs.go b/vfs/s3fs.go
index 7a8273bad9178b79b60fe611b3a232344be7121d..578e4a82a21938f6309fa0a26f442add3acab6df 100644
--- a/vfs/s3fs.go
+++ b/vfs/s3fs.go
@@ -914,7 +914,7 @@ func (*S3Fs) Close() error {
 	return nil
 }
 
-// GetAvailableDiskSize return the available size for the specified path
+// GetAvailableDiskSize returns the available size for the specified path
 func (*S3Fs) GetAvailableDiskSize(dirName string) (*sftp.StatVFS, error) {
 	return nil, ErrStorageSizeUnavailable
 }
diff --git a/vfs/sftpfs.go b/vfs/sftpfs.go
index fe78f34827d8acd119c34e5d0a40c4f67a3ed556..99368ab8aa250ea2ba5dce12831366d6c322d6a2 100644
--- a/vfs/sftpfs.go
+++ b/vfs/sftpfs.go
@@ -678,7 +678,7 @@ func (fs *SFTPFs) GetMimeType(name string) (string, error) {
 	return ctype, err
 }
 
-// GetAvailableDiskSize return the available size for the specified path
+// GetAvailableDiskSize returns the available size for the specified path
 func (fs *SFTPFs) GetAvailableDiskSize(dirName string) (*sftp.StatVFS, error) {
 	if err := fs.checkConnection(); err != nil {
 		return nil, err