diff --git a/pandora_console/general/register.php b/pandora_console/general/register.php
index 215e9642ef..839d7b661c 100644
--- a/pandora_console/general/register.php
+++ b/pandora_console/general/register.php
@@ -167,7 +167,7 @@ if (!$double_auth_enabled
     resizable: true,
     draggable: true,
     modal: true,
-    title: "<?php echo __('Double autentication activation'); ?>",
+    title: "<?php echo __('Double authentication activation'); ?>",
     overlay: {
       opacity: 0.5,
       background: "black"
@@ -185,9 +185,7 @@ if (!$double_auth_enabled
       //document.location.reload();
     }
   })
-    .show();    
-    // Don't allow close the dialog with X button
-    $('.ui-dialog-titlebar-close').css('display', 'none');
+    .show();
 
     </script>
     <?php
diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index 3ed36f8737..d3082d7bdf 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -1874,7 +1874,7 @@ function show_double_auth_activation () {
             resizable: true,
             draggable: true,
             modal: true,
-            title: "<?php echo __('Double autentication activation'); ?>",
+            title: "<?php echo __('Double authentication activation'); ?>",
             overlay: {
                 opacity: 0.5,
                 background: "black"
@@ -1952,7 +1952,7 @@ function show_double_auth_deactivation () {
             resizable: true,
             draggable: true,
             modal: true,
-            title: "<?php echo __('Double autentication activation'); ?>",
+            title: "<?php echo __('Double authentication activation'); ?>",
             overlay: {
                 opacity: 0.5,
                 background: "black"
diff --git a/pandora_console/index.php b/pandora_console/index.php
index ad0e37c505..cda8e3226c 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -512,6 +512,7 @@ if (isset($config['id_user']) === false) {
             if ((!isset($double_auth_success)
                 || !$double_auth_success)
                 && is_double_auth_enabled($nick_in_db)
+                && (bool) $config['double_auth_enabled'] === true
             ) {
                 // Store this values in the session to know if the user login
                 // was correct.
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index c9c875f4f4..b310c6297d 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -422,7 +422,7 @@ $timezone .= html_print_timezone_select('timezone', $user_info['timezone']).'</d
 // Double auth.
 $double_auth_enabled = (bool) db_get_value('id', 'tuser_double_auth', 'id_user', $config['id_user']);
 
-if ($config['double_auth_enabled'] || ($config['double_auth_enabled'] == '' && $double_auth_enabled)) {
+if ((bool) $config['double_auth_enabled'] === true) {
     $double_authentication = '<div class="label_select_simple"><p class="edit_user_labels">'.__('Double authentication').'</p>';
     if (($config['2FA_all_users'] == '' && !$double_auth_enabled)
         || ($config['2FA_all_users'] != '' && !$double_auth_enabled)
@@ -434,9 +434,6 @@ if ($config['double_auth_enabled'] || ($config['double_auth_enabled'] == '' && $
 
     // Dialog.
     $double_authentication .= '<div id="dialog-double_auth"class="invisible"><div id="dialog-double_auth-container"></div></div>';
-}
-
-if ($double_auth_enabled && $config['double_auth_enabled']) {
     $double_authentication .= html_print_button(__('Show information'), 'show_info', false, 'javascript:show_double_auth_info();', '', true);
 }
 
@@ -1139,7 +1136,7 @@ function show_double_auth_activation () {
             resizable: true,
             draggable: true,
             modal: true,
-            title: "<?php echo __('Double autentication activation'); ?>",
+            title: "<?php echo __('Double authentication activation'); ?>",
             overlay: {
                 opacity: 0.5,
                 background: "black"
@@ -1215,7 +1212,7 @@ function show_double_auth_deactivation () {
             resizable: true,
             draggable: true,
             modal: true,
-            title: "<?php echo __('Double autentication activation'); ?>",
+            title: "<?php echo __('Double authentication activation'); ?>",
             overlay: {
                 opacity: 0.5,
                 background: "black"