diff --git a/dev/Screen/User/Settings.js b/dev/Screen/User/Settings.js
index 655fe9450..b6d5116f7 100644
--- a/dev/Screen/User/Settings.js
+++ b/dev/Screen/User/Settings.js
@@ -41,9 +41,7 @@ export class SettingsUserScreen extends AbstractSettingsScreen {
 			views.push(UserSettingsFilters);
 		}
 
-		if (SettingsCapa('AutoLogout') || SettingsCapa('OpenPGP') || SettingsCapa('GnuPG')) {
-			views.push(UserSettingsSecurity);
-		}
+		views.push(UserSettingsSecurity);
 
 		views.push(UserSettingsFolders);
 
diff --git a/dev/Settings/User/Security.js b/dev/Settings/User/Security.js
index 7db770db1..4ba0cd8fd 100644
--- a/dev/Settings/User/Security.js
+++ b/dev/Settings/User/Security.js
@@ -21,11 +21,8 @@ export class UserSettingsSecurity extends AbstractViewSettings {
 	constructor() {
 		super();
 
-		this.capaAutoLogout = SettingsCapa('AutoLogout');
-
-		this.autoLogout = SettingsUserStore.autoLogout;
-
 		let i18nLogout = (key, params) => i18n('SETTINGS_SECURITY/AUTOLOGIN_' + key, params);
+		this.autoLogout = SettingsUserStore.autoLogout;
 		this.autoLogoutOptions = koComputable(() => {
 			translateTrigger();
 			return [
@@ -39,10 +36,7 @@ export class UserSettingsSecurity extends AbstractViewSettings {
 				{ id: 60 * 10, name: i18nLogout('HOURS_OPTION_NAME', { HOURS: 10 }) }
 			];
 		});
-
-		if (this.capaAutoLogout) {
-			this.addSetting('AutoLogout');
-		}
+		this.addSetting('AutoLogout');
 
 		this.gnupgPublicKeys = GnuPGUserStore.publicKeys;
 		this.gnupgPrivateKeys = GnuPGUserStore.privateKeys;
diff --git a/dev/Stores/User/Settings.js b/dev/Stores/User/Settings.js
index 6869783f7..bf27770d9 100644
--- a/dev/Stores/User/Settings.js
+++ b/dev/Stores/User/Settings.js
@@ -57,7 +57,7 @@ export const SettingsUserStore = new class {
 		let iAutoLogoutTimer;
 		self.delayLogout = (() => {
 			clearTimeout(iAutoLogoutTimer);
-			if (0 < self.autoLogout() && !SettingsGet('AccountSignMe') && SettingsCapa('AutoLogout')) {
+			if (0 < self.autoLogout() && !SettingsGet('AccountSignMe')) {
 				iAutoLogoutTimer = setTimeout(
 					rl.app.logout,
 					self.autoLogout() * 60000
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 658872366..84122777a 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -809,10 +809,6 @@ class Actions
 					$aResult['fontSerif'] = $oSettings->GetConf('fontSerif', '');
 					$aResult['fontMono'] = $oSettings->GetConf('fontMono', '');
 
-					if (!$this->GetCapa(Enumerations\Capa::AUTOLOGOUT)) {
-						$aResult['AutoLogout'] = 0;
-					}
-
 					if ($this->GetCapa(Enumerations\Capa::USER_BACKGROUND)) {
 						$aResult['UserBackgroundName'] = (string)$oSettings->GetConf('UserBackgroundName', $aResult['UserBackgroundName']);
 						$aResult['UserBackgroundHash'] = (string)$oSettings->GetConf('UserBackgroundHash', $aResult['UserBackgroundHash']);
@@ -1110,7 +1106,6 @@ class Actions
 		if (!$aResult) {
 			$oConfig = $this->oConfig;
 			$aResult = array(
-				'AutoLogout' => true,
 				'AdditionalAccounts'   => (bool) $oConfig->Get('webmail', 'allow_additional_accounts', false),
 				'AttachmentThumbnails' => (bool) $oConfig->Get('interface', 'show_attachment_thumbnail', true),
 				'AttachmentsActions'   => (bool) $oConfig->Get('capa', 'attachments_actions', false),
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php
index c301bfda1..61ba9a5c1 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php
@@ -17,5 +17,4 @@ class Capa
 	const MESSAGE_ACTIONS = 'MessageActions';
 	const ATTACHMENTS_ACTIONS = 'AttachmentsActions';
 	const DANGEROUS_ACTIONS = 'DangerousActions';
-	const AUTOLOGOUT = 'AutoLogout';
 }
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html
index 2368c0763..7f1dd2633 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html
@@ -1,4 +1,4 @@
-<div class="form-horizontal" data-bind="visible: capaAutoLogout">
+<div class="form-horizontal">
 	<div class="legend" data-i18n="SETTINGS_SECURITY/LEGEND_SECURITY"></div>
 	<div class="control-group">
 		<label data-i18n="SETTINGS_SECURITY/LABEL_AUTOLOGOUT"></label>