diff --git a/dev/Knoin/AbstractViews.js b/dev/Knoin/AbstractViews.js
index 5c7d56088..f5a37c9e6 100644
--- a/dev/Knoin/AbstractViews.js
+++ b/dev/Knoin/AbstractViews.js
@@ -3,11 +3,10 @@ import ko from 'ko';
 import { inFocus } from 'Common/Utils';
 import { addObservablesTo, addComputablesTo, addSubscribablesTo } from 'External/ko';
 import { Scope } from 'Common/Enums';
-import { keyScope, Settings, leftPanelDisabled } from 'Common/Globals';
+import { keyScope, SettingsGet, leftPanelDisabled } from 'Common/Globals';
 import { ViewType, showScreenPopup } from 'Knoin/Knoin';
 
 import { SaveSettingsStep } from 'Common/Enums';
-import { SettingsGet } from 'Common/Globals';
 
 class AbstractView {
 	constructor(templateID, type)
@@ -164,7 +163,7 @@ export class AbstractViewSettings
 export class AbstractViewLogin extends AbstractViewCenter {
 	constructor(templateID) {
 		super(templateID);
-		this.hideSubmitButton = Settings.app('hideSubmitButton');
+		this.hideSubmitButton = SettingsGet('hideSubmitButton');
 		this.formError = ko.observable(false).extend({ falseTimeout: 500 });
 	}
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
index 88f8860cc..c7c5142e1 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -662,7 +662,6 @@ class Actions
 			'inIframe' => (bool)$oConfig->Get('labs', 'in_iframe', false),
 			'allowHtmlEditorBitiButtons' => (bool)$oConfig->Get('labs', 'allow_html_editor_biti_buttons', false),
 			'allowCtrlEnterOnCompose' => (bool)$oConfig->Get('labs', 'allow_ctrl_enter_on_compose', false),
-			'hideSubmitButton' => (bool)$oConfig->Get('login', 'hide_submit_button', true),
 			'useImapThread' => (bool)$oConfig->Get('labs', 'use_imap_thread', false),
 			'allowAppendMessage' => (bool)$oConfig->Get('labs', 'allow_message_append', false),
 			'folderSpecLimit' => (int)$oConfig->Get('labs', 'folders_spec_limit', 50),
@@ -709,6 +708,7 @@ class Actions
 			'LoadingDescription' => $oConfig->Get('webmail', 'loading_description', 'SnappyMail'),
 			'FaviconUrl' => $oConfig->Get('webmail', 'favicon_url', ''),
 			'LoginDefaultDomain' => $oConfig->Get('login', 'default_domain', ''),
+			'hideSubmitButton' => (bool)$oConfig->Get('login', 'hide_submit_button', true),
 			'DetermineUserLanguage' => (bool)$oConfig->Get('login', 'determine_user_language', true),
 			'DetermineUserDomain' => (bool)$oConfig->Get('login', 'determine_user_domain', false),
 			'SieveAllowFileintoInbox' => (bool)$oConfig->Get('labs', 'sieve_allow_fileinto_inbox', false),