diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
index de807594d678f..3c3f83835b9d5 100644
--- a/custom/conf/app.example.ini
+++ b/custom/conf/app.example.ini
@@ -2483,5 +2483,5 @@ ROUTER = console
 ;PROXY_HOSTS =
 
 ;[user]
-; Disabled modules from user settings, could be passwords, deletion, security, applications, gpg keys, organizations
-;USER_SETTING_DISABLED_MODULES =
+; Disabled modules from user settings, could be password, deletion, security, applications, gpg keys, organizations
+;SETTING_DISABLED_MODULES =
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl
index b59310bd39b19..7319c5e681895 100644
--- a/templates/user/settings/account.tmpl
+++ b/templates/user/settings/account.tmpl
@@ -135,31 +135,40 @@
 			</form>
 		</div>
 
-		<h4 class="ui top attached error header">
-			{{.locale.Tr "settings.delete_account"}}
-		</h4>
-		<div class="ui attached error segment">
-			<div class="ui red message">
-				<p class="text left">{{svg "octicon-alert"}} {{.locale.Tr "settings.delete_prompt" | Str2html}}</p>
-				{{if .UserDeleteWithComments}}
-				<p class="text left" style="font-weight: bold;">{{.locale.Tr "settings.delete_with_all_comments" .UserDeleteWithCommentsMaxTime | Str2html}}</p>
-				{{end}}
-			</div>
-			<form class="ui form ignore-dirty" id="delete-form" action="{{AppSubUrl}}/user/settings/account/delete" method="post">
-				{{template "base/disable_form_autofill"}}
-				{{.CsrfTokenHtml}}
-				<div class="required field {{if .Err_Password}}error{{end}}">
-					<label for="password-confirmation">{{.locale.Tr "password"}}</label>
-					<input id="password-confirmation" name="password" type="password" autocomplete="off" required>
+		{{if $.UserModules.Enabled "deletion"}}
+			<h4 class="ui top attached error header">
+				{{.locale.Tr "settings.delete_account"}}
+			</h4>
+			<div class="ui attached error segment">
+				<div class="ui red message">
+					<p class="text left">{{svg "octicon-alert"}} {{.locale.Tr "settings.delete_prompt" | Str2html}}</p>
+					{{if .UserDeleteWithComments}}
+					<p class="text left" style="font-weight: bold;">{{.locale.Tr "settings.delete_with_all_comments" .UserDeleteWithCommentsMaxTime | Str2html}}</p>
+					{{end}}
 				</div>
-				<div class="field">
-					<div class="ui red button delete-button" data-modal-id="delete-account" data-type="form" data-form="#delete-form">
-						{{.locale.Tr "settings.confirm_delete_account"}}
-					</div>
-					<a href="{{AppSubUrl}}/user/forgot_password?email={{.Email}}">{{.locale.Tr "auth.forgot_password"}}</a>
+				<form class="ui form ignore-dirty" id="delete-form" action="{{AppSubUrl}}/user/settings/account/delete" method="post">
+					{{template "base/disable_form_autofill"}}
+					{{.CsrfTokenHtml}}
+					<div class="required field {{if .Err_Password}}error{{end}}">
+						<label for="password-confirmation">{{.locale.Tr "password"}}</label>
+						<input id="password-confirmation" name="password" type="password" autocomplete="off" required>
 				</div>
-			</form>
-		</div>
+				<form class="ui form ignore-dirty" id="delete-form" action="{{AppSubUrl}}/user/settings/account/delete" method="post">
+					{{template "base/disable_form_autofill"}}
+					{{.CsrfTokenHtml}}
+					<div class="required field {{if .Err_Password}}error{{end}}">
+						<label for="password-confirmation">{{.locale.Tr "password"}}</label>
+						<input id="password-confirmation" name="password" type="password" autocomplete="off" required>
+					</div>
+					<div class="field">
+						<div class="ui red button delete-button" data-modal-id="delete-account" data-type="form" data-form="#delete-form">
+							{{.locale.Tr "settings.confirm_delete_account"}}
+						</div>
+						<a href="{{AppSubUrl}}/user/forgot_password?email={{.Email}}">{{.locale.Tr "auth.forgot_password"}}</a>
+					</div>
+				</form>
+			</div>
+		{{end}}
 	</div>
 </div>
 
@@ -174,17 +183,15 @@
 	{{template "base/delete_modal_actions" .}}
 </div>
 
-{{if $.UserModules.Enabled "deletion"}}
-	<div class="ui small basic delete modal" id="delete-account">
-		<div class="ui icon header">
-			{{svg "octicon-trash"}}
-			{{.locale.Tr "settings.delete_account_title"}}
-		</div>
-		<div class="content">
-			<p>{{.locale.Tr "settings.delete_account_desc"}}</p>
-		</div>
-		{{template "base/delete_modal_actions" .}}
+<div class="ui small basic delete modal" id="delete-account">
+	<div class="ui icon header">
+		{{svg "octicon-trash"}}
+		{{.locale.Tr "settings.delete_account_title"}}
 	</div>
-{{end}}
+	<div class="content">
+		<p>{{.locale.Tr "settings.delete_account_desc"}}</p>
+	</div>
+	{{template "base/delete_modal_actions" .}}
+</div>
 
 {{template "base/footer" .}}