diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index 6ed568a02f..c5e17d1bcc 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -1175,7 +1175,11 @@ if ($config['double_auth_enabled'] && check_acl($config['id_user'], 0, 'PM')) {
         || ($config['double_auth_enabled'] == '' && $double_auth_enabled)
         || check_acl($config['id_user'], 0, 'PM')
     ) {
-        $double_authentication .= html_print_checkbox_switch('double_auth', 1, $double_auth_enabled, true);
+        if ($new_user === false) {
+            $double_authentication .= html_print_checkbox_switch('double_auth', 1, $double_auth_enabled, true);
+        } else {
+            $double_authentication .= ui_print_help_tip(__('User must be created before activating double authentication.'), true);
+        }
     }
 
     // Dialog.
@@ -1581,6 +1585,7 @@ console.log(userID);
         data: {
             page: 'include/ajax/double_auth.ajax',
             id_user: userID,
+            id_user_auth: userID,
             get_double_auth_data_page: 1,
             FA_forced: 1,
             containerID: $dialogContainer.prop('id')
@@ -1637,6 +1642,8 @@ function show_double_auth_activation () {
 
     var $loadingSpinner = $("<img src=\"<?php echo $config['homeurl']; ?>/images/spinner.gif\" />");
     var $dialogContainer = $("div#dialog-double_auth-container");
+    // Uncheck until completed successfully.
+    $("input#checkbox-double_auth").prop( "checked", false );
 
     $dialogContainer.html($loadingSpinner);
 
@@ -1648,6 +1655,7 @@ function show_double_auth_activation () {
         data: {
             page: 'include/ajax/double_auth.ajax',
             id_user: userID,
+            id_user_auth: userID,
             FA_forced: 1,
             get_double_auth_info_page: 1,
             containerID: $dialogContainer.prop('id')
@@ -1690,8 +1698,6 @@ function show_double_auth_activation () {
                     request.abort();
                 // Remove the contained html
                 $dialogContainer.empty();
-
-                document.location.reload();
             }
         })
         .show();
@@ -1705,6 +1711,9 @@ function show_double_auth_deactivation () {
 
     var message = "<p><?php echo __('Are you sure?').'<br>'.__('The double authentication will be deactivated'); ?></p>";
     var $button = $("<input type=\"button\" value=\"<?php echo __('Deactivate'); ?>\" />");
+    // Prevent switch deactivaction until proceess is done
+    $("input#checkbox-double_auth").prop( "checked", true );
+
 
     $dialogContainer
         .empty()
@@ -1739,6 +1748,7 @@ function show_double_auth_deactivation () {
                 }
                 else if (data) {
                     $dialogContainer.html("<?php echo '<b><div class=\"green\">'.__('The double autentication was deactivated successfully').'</div></b>'; ?>");
+                    $("input#checkbox-double_auth").prop( "checked", false );
                 }
                 else {
                     $dialogContainer.html("<?php echo '<b><div class=\"red\">'.__('There was an error deactivating the double autentication').'</div></b>'; ?>");
@@ -1769,7 +1779,6 @@ function show_double_auth_deactivation () {
                 // Remove the contained html
                 $dialogContainer.empty();
 
-                document.location.reload();
             }
         })
         .show();
diff --git a/pandora_console/include/ajax/double_auth.ajax.php b/pandora_console/include/ajax/double_auth.ajax.php
index b5c816c6b3..ebe45a3894 100644
--- a/pandora_console/include/ajax/double_auth.ajax.php
+++ b/pandora_console/include/ajax/double_auth.ajax.php
@@ -18,6 +18,8 @@ check_login();
 // Security check
 $id_user = (string) get_parameter('id_user');
 $FA_forced = (int) get_parameter('FA_forced');
+$id_user_auth = (string) get_parameter('id_user_auth', $config['id_user']);
+
 
 if ($id_user !== $config['id_user'] && $FA_forced != 1) {
     db_pandora_audit(
@@ -70,12 +72,12 @@ if ($validate_double_auth_code) {
 
             if ($result && $save) {
                 // Delete the actual value (if exists)
-                $where = ['id_user' => $id_user];
+                $where = ['id_user' => $id_user_auth];
                 db_process_sql_delete('tuser_double_auth', $where);
 
                 // Insert the new value
                 $values = [
-                    'id_user' => $id_user,
+                    'id_user' => $id_user_auth,
                     'secret'  => $secret,
                 ];
                 $result = (bool) db_process_sql_insert('tuser_double_auth', $values);
@@ -152,12 +154,15 @@ if ($get_double_auth_data_page) {
 
     ob_clean();
     ?>
+    
+<script type="text/javascript" src="../../include/javascript/qrcode.js"></script>
 <script type="text/javascript">
+
     var secret = "<?php echo $secret; ?>";
-    var userID = "<?php echo $config['id_user']; ?>";
+    var id_user_auth = "<?php echo $id_user_auth; ?>";
 
     // QR code with the secret to add it to the app
-    paint_qrcode("otpauth://totp/"+userID+"?secret="+secret, $("div#qr-container").get(0), 200, 200);
+    paint_qrcode("otpauth://totp/"+id_user_auth+"?secret="+secret, $("div#qr-container").get(0), 200, 200);
 
     $("div#qr-container").attr("title", "").find("canvas").remove();
     // Don't delete this timeout. It's necessary to perform the style change.
@@ -219,6 +224,7 @@ if ($get_double_auth_info_page) {
         }
 
         var containerID = "<?php echo $container_id; ?>";
+        var id_user_auth = "<?php echo $id_user_auth; ?>";
 
         $("#"+containerID).html("<img src=\"<?php echo $config['homeurl']; ?>/images/spinner.gif\" />");
 
@@ -229,6 +235,7 @@ if ($get_double_auth_info_page) {
             data: {
                 page: 'include/ajax/double_auth.ajax',
                 id_user: "<?php echo $config['id_user']; ?>",
+                id_user_auth: id_user_auth,
                 get_double_auth_generation_page: 1,
                 containerID: containerID
             },
@@ -298,10 +305,10 @@ if ($get_double_auth_generation_page) {
 <script type="text/javascript" src="../../include/javascript/qrcode.js"></script>
 <script type="text/javascript">
     var secret = "<?php echo $secret; ?>";
-    var userID = "<?php echo $config['id_user']; ?>";
+    var id_user_auth = "<?php echo $id_user_auth; ?>";
 
     // QR code with the secret to add it to the app
-    paint_qrcode("otpauth://totp/"+userID+"?secret="+secret, $("div#qr-container").get(0), 200, 200);
+    paint_qrcode("otpauth://totp/"+id_user_auth+"?secret="+secret, $("div#qr-container").get(0), 200, 200);
 
     $("div#qr-container").attr("title", "").find("canvas").remove();
     // Don't delete this timeout. It's necessary to perform the style change.
@@ -325,7 +332,8 @@ if ($get_double_auth_generation_page) {
             dataType: 'html',
             data: {
                 page: 'include/ajax/double_auth.ajax',
-                id_user: userID,
+                id_user: "<?php echo $config['id_user']; ?>",
+                id_user_auth, id_user_auth,
                 get_double_auth_generation_page: 1,
                 containerID: containerID
             },
@@ -370,6 +378,7 @@ if ($get_double_auth_generation_page) {
             data: {
                 page: 'include/ajax/double_auth.ajax',
                 id_user: "<?php echo $config['id_user']; ?>",
+                id_user_auth: id_user_auth,
                 get_double_auth_validation_page: 1,
                 secret: secret,
                 containerID: containerID
@@ -464,6 +473,7 @@ if ($get_double_auth_validation_page) {
             data: {
                 page: 'include/ajax/double_auth.ajax',
                 id_user: "<?php echo $config['id_user']; ?>",
+                id_user_auth: id_user_auth,
                 validate_double_auth_code: 1,
                 save: 1,
                 secret: secret,
@@ -479,6 +489,7 @@ if ($get_double_auth_validation_page) {
                 // Valid code
                 if (data === true) {
                     $("#"+containerID).html("<b><?php echo '<b><div class=\"green\">'.__('The code is valid, you can exit now').'</div></b>'; ?></b>");
+                    $("input#checkbox-double_auth").prop( "checked", true );
                 }
                 // Invalid code
                 else if (data === false) {
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index 4f93152b9a..bf563d7d47 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -426,7 +426,7 @@ if ($config['double_auth_enabled'] || ($config['double_auth_enabled'] == '' && $
     $double_authentication .= '<div id="dialog-double_auth" style="display:none"><div id="dialog-double_auth-container"></div></div>';
 }
 
-if ($double_auth_enabled && $config['double_auth_enabled'] && $config['2FA_all_users'] != '') {
+if ($double_auth_enabled && $config['double_auth_enabled']) {
     $double_authentication .= html_print_button(__('Show information'), 'show_info', false, 'javascript:show_double_auth_info();', '', true);
 }
 
@@ -981,6 +981,7 @@ function show_double_auth_info () {
         data: {
             page: 'include/ajax/double_auth.ajax',
             id_user: userID,
+            id_user_auth: userID,
             get_double_auth_data_page: 1,
             containerID: $dialogContainer.prop('id')
         },