diff --git a/classes/pref/users.php b/classes/pref/users.php
index cd56b4f24..f228ab390 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -116,6 +116,7 @@ class Pref_Users extends Handler_Administrative {
 				$user->login = mb_strtolower($login);
 				$user->access_level = (int) clean($_REQUEST["access_level"]);
 				$user->email = clean($_REQUEST["email"]);
+				$user->otp_enabled = checkbox_to_sql_bool($_REQUEST["otp_enabled"]);
 
 				$user->save();
 			}
diff --git a/js/PrefUsers.js b/js/PrefUsers.js
index 109782f6c..378c97154 100644
--- a/js/PrefUsers.js
+++ b/js/PrefUsers.js
@@ -59,8 +59,6 @@ const	Users = {
 						<div dojoType="dijit.layout.TabContainer" style="height : 400px">
 							<div dojoType="dijit.layout.ContentPane" title="${__('Edit user')}">
 
-								<header>${__("User")}</header>
-
 								<section>
 									<fieldset>
 										<label>${__("Login:")}</label>
@@ -71,11 +69,9 @@ const	Users = {
 
 										${admin_disabled ? App.FormFields.hidden_tag("login", user.login) : ''}
 									</fieldset>
-								</section>
 
-								<header>${__("Authentication")}</header>
+									<hr/>
 
-								<section>
 									<fieldset>
 										<label>${__('Access level: ')}</label>
 										${App.FormFields.select_hash("access_level",
@@ -89,11 +85,15 @@ const	Users = {
 										<input dojoType='dijit.form.TextBox' type='password' size='20'
 											placeholder='${__("Change password")}' name='password'>
 									</fieldset>
-								</section>
+									<fieldset>
+									<label></label>
+									<label class="checkbox">
+										${App.FormFields.checkbox_tag("otp_enabled", user.otp_enabled)}
+										${__('OTP enabled')}
+									</fieldset>
 
-								<header>${__("Options")}</header>
+									<hr/>
 
-								<section>
 									<fieldset>
 										<label>${__("E-mail:")}</label>
 										<input dojoType='dijit.form.TextBox' size='30' name='email'