diff --git a/dev/Settings/Admin/Login.js b/dev/Settings/Admin/Login.js
index 17b60a81c..b3f6025e6 100644
--- a/dev/Settings/Admin/Login.js
+++ b/dev/Settings/Admin/Login.js
@@ -11,7 +11,7 @@ class LoginAdminSettings {
 			determineUserLanguage: !!settingsGet('DetermineUserLanguage'),
 			determineUserDomain: !!settingsGet('DetermineUserDomain'),
 			allowLanguagesOnLogin: !!settingsGet('AllowLanguagesOnLogin'),
-			dummy: false
+			hideSubmitButton: !!rl.settings.app('hideSubmitButton')
 		});
 
 		this.defaultDomain = ko.observable(settingsGet('LoginDefaultDomain')).idleTrigger();
@@ -21,29 +21,35 @@ class LoginAdminSettings {
 		setTimeout(() => {
 			const f1 = settingsSaveHelperSimpleFunction(this.defaultDomain.trigger, this);
 
-			this.determineUserLanguage.subscribe(value => {
+			this.determineUserLanguage.subscribe(value =>
 				Remote.saveAdminConfig(null, {
 					'DetermineUserLanguage': value ? '1' : '0'
-				});
-			});
+				})
+			);
 
-			this.determineUserDomain.subscribe(value => {
+			this.determineUserDomain.subscribe(value =>
 				Remote.saveAdminConfig(null, {
 					'DetermineUserDomain': value ? '1' : '0'
-				});
-			});
+				})
+			);
 
-			this.allowLanguagesOnLogin.subscribe(value => {
+			this.allowLanguagesOnLogin.subscribe(value =>
 				Remote.saveAdminConfig(null, {
 					'AllowLanguagesOnLogin': value ? '1' : '0'
-				});
-			});
+				})
+			);
 
-			this.defaultDomain.subscribe(value => {
+			this.hideSubmitButton.subscribe(value =>
+				Remote.saveAdminConfig(null, {
+					'hideSubmitButton': value ? '1' : '0'
+				})
+			);
+
+			this.defaultDomain.subscribe(value =>
 				Remote.saveAdminConfig(f1, {
 					'LoginDefaultDomain': value.trim()
-				});
-			});
+				})
+			);
 		}, 50);
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
index c56f96efc..98959c664 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
@@ -140,6 +140,7 @@ trait Admin
 
 		$this->setConfigFromParams($oConfig, 'AllowLanguagesOnSettings', 'webmail', 'allow_languages_on_settings', 'bool');
 		$this->setConfigFromParams($oConfig, 'AllowLanguagesOnLogin', 'login', 'allow_languages_on_login', 'bool');
+		$this->setConfigFromParams($oConfig, 'hideSubmitButton', 'login', 'hide_submit_button', 'bool');
 		$this->setConfigFromParams($oConfig, 'AttachmentLimit', 'webmail', 'attachment_size_limit', 'int');
 
 		$this->setConfigFromParams($oConfig, 'LoginDefaultDomain', 'login', 'default_domain', 'string');
diff --git a/snappymail/v/0.0.0/app/localization/admin/_source.en.yml b/snappymail/v/0.0.0/app/localization/admin/_source.en.yml
index 57f5956e5..c03462611 100644
--- a/snappymail/v/0.0.0/app/localization/admin/_source.en.yml
+++ b/snappymail/v/0.0.0/app/localization/admin/_source.en.yml
@@ -27,7 +27,6 @@ en:
     LABEL_ALLOW_BACKGROUND_ON_SETTINGS: "Allow background selection on settings screen"
     LABEL_NEW_FOLDER_MOVE: "New \"move to folder\" button"
     LABEL_SHOW_THUMBNAILS: "Show thumbnails (attachments)"
-    LABEL_ALLOW_GRAVATAR: "Allow Gravatar"
     LEGEND_MAIN: "Main"
     LABEL_ATTACHMENT_SIZE_LIMIT: "Attachment size limit"
     LABEL_ALLOW_ADDITIONAL_ACCOUNTS: "Allow additional accounts"
@@ -47,6 +46,7 @@ en:
     LABEL_DETERMINE_USER_DOMAIN: "Try to determine user domain"
     LABEL_ALLOW_LANGUAGES_ON_LOGIN: "Allow language selection on login screen"
     LABEL_DETERMINE_USER_LANGUAGE: "Try to determine user language"
+    LABEL_HIDE_SUBMIT_BUTTON: "Hide the 'Sign In' button"
   TAB_BRANDING:
     LEGEND_BRANDING: "Branding"
     LABEL_PAGE_TITLE: "Page Title"
diff --git a/snappymail/v/0.0.0/app/localization/admin/de_DE.yml b/snappymail/v/0.0.0/app/localization/admin/de_DE.yml
index 6a9314fb1..1ecbadf86 100644
--- a/snappymail/v/0.0.0/app/localization/admin/de_DE.yml
+++ b/snappymail/v/0.0.0/app/localization/admin/de_DE.yml
@@ -27,7 +27,6 @@ de_DE:
     LABEL_ALLOW_BACKGROUND_ON_SETTINGS: "Hintergrundauswahl in den Einstellungen zulassen"
     LABEL_NEW_FOLDER_MOVE: "Neue \"Verschieben nach\"-Schaltfläche"
     LABEL_SHOW_THUMBNAILS: "Vorschaubilder anzeigen (Anhänge)"
-    LABEL_ALLOW_GRAVATAR: "Gravatar erlauben"
     LEGEND_MAIN: "Allgemein"
     LABEL_ATTACHMENT_SIZE_LIMIT: "Größenlimit für Anhänge"
     LABEL_ALLOW_ADDITIONAL_ACCOUNTS: "Zusätzliche Konten erlauben"
@@ -45,6 +44,7 @@ de_DE:
     LABEL_DETERMINE_USER_DOMAIN: "Versuche Domain des Benutzers zu ermitteln"
     LABEL_ALLOW_LANGUAGES_ON_LOGIN: "Sprachauswahl bei der Anmeldung zulassen"
     LABEL_DETERMINE_USER_LANGUAGE: "Versuche Sprache des Benutzers zu ermitteln"
+    LABEL_HIDE_SUBMIT_BUTTON: "Die Schaltfläche 'Anmelden' ausblenden"
   TAB_BRANDING:
     LEGEND_BRANDING: "Branding"
     LABEL_PAGE_TITLE: "Seitentitel"
diff --git a/snappymail/v/0.0.0/app/localization/admin/en_US.yml b/snappymail/v/0.0.0/app/localization/admin/en_US.yml
index fa2764a47..2268b8e12 100644
--- a/snappymail/v/0.0.0/app/localization/admin/en_US.yml
+++ b/snappymail/v/0.0.0/app/localization/admin/en_US.yml
@@ -25,8 +25,8 @@ en_US:
     LABEL_ALLOW_LANGUAGES_ON_SETTINGS: "Allow language selection on settings screen"
     LABEL_ALLOW_THEMES_ON_SETTINGS: "Allow theme selection on settings screen"
     LABEL_ALLOW_BACKGROUND_ON_SETTINGS: "Allow background selection on settings screen"
+    LABEL_NEW_FOLDER_MOVE: "New \"move to folder\" button"
     LABEL_SHOW_THUMBNAILS: "Show thumbnails (attachments)"
-    LABEL_ALLOW_GRAVATAR: "Allow Gravatar"
     LEGEND_MAIN: "Main"
     LABEL_ATTACHMENT_SIZE_LIMIT: "Attachment size limit"
     LABEL_ALLOW_ADDITIONAL_ACCOUNTS: "Allow additional accounts"
@@ -45,6 +45,7 @@ en_US:
     LABEL_DETERMINE_USER_DOMAIN: "Try to determine user domain"
     LABEL_ALLOW_LANGUAGES_ON_LOGIN: "Allow language selection on login screen"
     LABEL_DETERMINE_USER_LANGUAGE: "Try to determine user language"
+    LABEL_HIDE_SUBMIT_BUTTON: "Hide the 'Sign In' button"
   TAB_BRANDING:
     LEGEND_BRANDING: "Branding"
     LABEL_PAGE_TITLE: "Page Title"
diff --git a/snappymail/v/0.0.0/app/localization/admin/es_ES.yml b/snappymail/v/0.0.0/app/localization/admin/es_ES.yml
index 6f2347a3b..f21063b4c 100644
--- a/snappymail/v/0.0.0/app/localization/admin/es_ES.yml
+++ b/snappymail/v/0.0.0/app/localization/admin/es_ES.yml
@@ -27,7 +27,6 @@ es_ES:
     LABEL_ALLOW_BACKGROUND_ON_SETTINGS: "Permitir cambiar el fondo de pantalla"
     LABEL_NEW_FOLDER_MOVE: "Nuevo botón \"mover a carpeta\""
     LABEL_SHOW_THUMBNAILS: "Mostrar previsualización (adjuntos)"
-    LABEL_ALLOW_GRAVATAR: "Usar Gravatar"
     LEGEND_MAIN: "Principal"
     LABEL_ATTACHMENT_SIZE_LIMIT: "Tamaño máximo para adjuntos"
     LABEL_ALLOW_ADDITIONAL_ACCOUNTS: "Permitir cuentas adicionales"
@@ -46,6 +45,7 @@ es_ES:
     LABEL_DETERMINE_USER_DOMAIN: "Intentar encontrar el dominio del usuario"
     LABEL_ALLOW_LANGUAGES_ON_LOGIN: "Permitir la selección de idioma en la pantalla de ingreso"
     LABEL_DETERMINE_USER_LANGUAGE: "Intentar definir el idioma del usuari"
+    LABEL_HIDE_SUBMIT_BUTTON: "Ocultar el botón 'Acceder'"
   TAB_BRANDING:
     LEGEND_BRANDING: "Personalización"
     LABEL_PAGE_TITLE: "Título de la página"
diff --git a/snappymail/v/0.0.0/app/localization/admin/fr_FR.yml b/snappymail/v/0.0.0/app/localization/admin/fr_FR.yml
index 014666b34..10923ece3 100644
--- a/snappymail/v/0.0.0/app/localization/admin/fr_FR.yml
+++ b/snappymail/v/0.0.0/app/localization/admin/fr_FR.yml
@@ -27,7 +27,6 @@ fr_FR:
     LABEL_ALLOW_BACKGROUND_ON_SETTINGS: "Permettre la sélection de l'arrière-plan dans les paramètres"
     LABEL_NEW_FOLDER_MOVE: "Nouveau bouton \"déplacer vers le dossier\""
     LABEL_SHOW_THUMBNAILS: "Montrer les miniatures (pièces jointes)"
-    LABEL_ALLOW_GRAVATAR: "Autoriser Gravatar"
     LEGEND_MAIN: "Principal"
     LABEL_ATTACHMENT_SIZE_LIMIT: "Taille limite des pièces jointes"
     LABEL_ALLOW_ADDITIONAL_ACCOUNTS: "Autoriser les comptes supplémentaires"
@@ -46,6 +45,7 @@ fr_FR:
     LABEL_DETERMINE_USER_DOMAIN: "Deviner le domaine de l'utilisateur"
     LABEL_ALLOW_LANGUAGES_ON_LOGIN: "Permettre la sélection de la langue sur l'écran de connexion"
     LABEL_DETERMINE_USER_LANGUAGE: "Deviner la langue de l'utilisateur"
+    LABEL_HIDE_SUBMIT_BUTTON: "Masquer le bouton 'Se connecter'"
   TAB_BRANDING:
     LEGEND_BRANDING: "Logo & Marque"
     LABEL_PAGE_TITLE: "Titre de la page"
diff --git a/snappymail/v/0.0.0/app/localization/admin/nl_NL.yml b/snappymail/v/0.0.0/app/localization/admin/nl_NL.yml
index 84073690d..e697563c0 100644
--- a/snappymail/v/0.0.0/app/localization/admin/nl_NL.yml
+++ b/snappymail/v/0.0.0/app/localization/admin/nl_NL.yml
@@ -27,7 +27,6 @@ nl_NL:
     LABEL_ALLOW_BACKGROUND_ON_SETTINGS: "Sta achtergrond selectie toe in het instellingen scherm"
     LABEL_NEW_FOLDER_MOVE: "Nieuwe \"verplaats naar map\" knop"
     LABEL_SHOW_THUMBNAILS: "Toon miniaturen (bijlage)"
-    LABEL_ALLOW_GRAVATAR: "Toon Gravatar"
     LEGEND_MAIN: "Diverse"
     LABEL_ATTACHMENT_SIZE_LIMIT: "Maximale bijlage grootte"
     LABEL_ALLOW_ADDITIONAL_ACCOUNTS: "Sta extra accounts toe"
@@ -45,6 +44,7 @@ nl_NL:
     LABEL_DETERMINE_USER_DOMAIN: "Probeer gebruikersdomein te bepalen"
     LABEL_ALLOW_LANGUAGES_ON_LOGIN: "Sta taal selectie toe in het login scherm"
     LABEL_DETERMINE_USER_LANGUAGE: "Probeer gebruiker taal te bepalen"
+    LABEL_HIDE_SUBMIT_BUTTON: "Verberg de 'Aanmelden' knop"
   TAB_BRANDING:
     LEGEND_BRANDING: "Huisstijl"
     LABEL_PAGE_TITLE: "Pagina titel"
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsLogin.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsLogin.html
index 4d0efc51a..62e6a7c0d 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsLogin.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsLogin.html
@@ -29,7 +29,12 @@
 					name: 'Checkbox',
 					params: { enable: allowLanguagesOnLogin, value: determineUserLanguage, label: 'TAB_LOGIN/LABEL_DETERMINE_USER_LANGUAGE' }
 				}"></div>
+				<br />
+				<div data-bind="component: {
+					name: 'Checkbox',
+					params: { value: hideSubmitButton, label: 'TAB_LOGIN/LABEL_HIDE_SUBMIT_BUTTON' }
+				}"></div>
 			</div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>