diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 647b719ae3..4afd0cf5a4 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -467,7 +467,7 @@ function config_update_config()
                 break;
 
                 case 'pass':
-                    if (isset($config['enterprise_installed']) === true && (bool) $config['enterprise_installed'] === 1) {
+                    if (isset($config['enterprise_installed']) === true && (bool) $config['enterprise_installed'] === true) {
                         if (config_update_value('enable_pass_policy', get_parameter('enable_pass_policy'), true) === false) {
                             $error_update[] = __('Enable password policy');
                         }
@@ -515,6 +515,10 @@ function config_update_config()
                         if (config_update_value('reset_pass_option', (bool) get_parameter('reset_pass_option'), true) === false) {
                             $error_update[] = __('Activate reset password');
                         }
+
+                        if (config_update_value('exclusion_word_list', (string) get_parameter('exclusion_word_list'), true) === false) {
+                            $error_update[] = __('Exclusion word list for passwords');
+                        }
                     }
                 break;
 
@@ -2195,6 +2199,10 @@ function config_process_config()
         config_update_value('reset_pass_option', 0);
     }
 
+    if (isset($config['exclusion_word_list']) === false) {
+        config_update_value('exclusion_word_list', '');
+    }
+
     if (!isset($config['include_agents'])) {
         config_update_value('include_agents', 0);
     }
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index eeff4d2fce..13e617f877 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -9119,3 +9119,37 @@ div#err_msg_centralised {
   margin-right: -110px;
   margin-top: 13px;
 }
+
+.tag-editor {
+  padding: 0.5em !important;
+}
+
+.tag-editor div {
+  float: right !important;
+}
+
+.tag-editor .tag-editor-tag {
+  padding: 5px !important;
+  color: #fff !important;
+  background: #82b92e !important;
+  border-radius: 0 2px 2px 0 !important;
+}
+
+.tag-editor .tag-editor-delete {
+  padding: 5px !important;
+  line-height: 16px !important;
+  background: #82b92e !important;
+  border-radius: 2px 0 0 2px !important;
+}
+
+.tag-editor .tag-editor-delete i {
+  line-height: 16pt !important;
+}
+
+.tag-editor .tag-editor-delete i:before {
+  color: #fff !important;
+}
+
+.tag-editor .tag-editor-delete:hover i:before {
+  color: #ccc !important;
+}