diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index 928b1d39a7..9702d73d78 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -268,7 +268,7 @@ echo '</div>';
 echo '<div id="ver_num">'.$pandora_version.(($develop_bypass == 1) ? ' '.__('Build').' '.$build_version : '') . '</div>';
 echo '</div>';
 
-if ($process_error_message == '') {
+if ($process_error_message == '' && $mail != "") {
 	echo '<div id="reset_correct" title="' . __('Password reset') . '">';
 		echo '<div class="content_alert">';
 			echo '<div class="icon_message_alert">';
@@ -286,7 +286,7 @@ if ($process_error_message == '') {
 		echo '</div>';
 	echo '</div>';
 }
-else {
+else if ($process_error_message != '') {
 	echo '<div id="reset_correct" title="' . __('Password reset') . '">';
 		echo '<div class="content_alert">';
 			echo '<div class="icon_message_alert">';
diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index 0a0652655d..1bd5773822 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -249,7 +249,6 @@ if (check_acl ($config['id_user'], 0, "PM")) {
 	enterprise_hook ('enterprise_submenu');
 	enterprise_hook ('historydb_submenu');
 	enterprise_hook ('log_collector_submenu');
-	enterprise_hook ('mail_submenu');
 	
 	$sub2["godmode/setup/setup&amp;section=auth"]["text"] =  __('Authentication');
 	$sub2["godmode/setup/setup&amp;section=auth"]["refr"] = 0;
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 576cf5e3ac..612667f1a8 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -249,6 +249,19 @@ function config_update_config () {
 						$inventory_changes_blacklist = get_parameter('inventory_changes_blacklist', array());
 						if (!config_update_value ('inventory_changes_blacklist', implode(',',$inventory_changes_blacklist)))
 							$error_update[] = __('Inventory changes blacklist');
+
+						if (!config_update_value ('email_from_dir', get_parameter('email_from_dir')))
+							$error_update[] = __('From dir');
+						if (!config_update_value ('email_from_name', get_parameter('email_from_name')))
+							$error_update[] = __('From name');
+						if (!config_update_value ('email_smtpServer', get_parameter('email_smtpServer')))
+							$error_update[] = __('Server SMTP');
+						if (!config_update_value ('email_smtpPort', (int)get_parameter('email_smtpPort')))
+							$error_update[] = __('Port SMTP');
+						if (!config_update_value ('email_username', get_parameter('email_username')))
+							$error_update[] = __('Email user');
+						if (!config_update_value ('email_password', get_parameter('email_password')))
+							$error_update[] = __('Email password');
 						
 					}
 					break;
@@ -708,20 +721,6 @@ function config_update_config () {
 				if (!config_update_value ('history_db_delay', get_parameter ('history_db_delay')))
 					$error_update[] = __('Delay');
 				break;
-			case 'mail':
-				if (!config_update_value ('email_from_dir', get_parameter('email_from_dir')))
-					$error_update[] = __('From dir');
-				if (!config_update_value ('email_from_name', get_parameter('email_from_name')))
-					$error_update[] = __('From name');
-				if (!config_update_value ('email_smtpServer', get_parameter('email_smtpServer')))
-					$error_update[] = __('Server SMTP');
-				if (!config_update_value ('email_smtpPort', (int)get_parameter('email_smtpPort')))
-					$error_update[] = __('Port SMTP');
-				if (!config_update_value ('email_username', get_parameter('email_username')))
-					$error_update[] = __('Email user');
-				if (!config_update_value ('email_password', get_parameter('email_password')))
-					$error_update[] = __('Email password');
-				break;
 			case 'ehorus':
 				if (!config_update_value('ehorus_enabled', (int) get_parameter('ehorus_enabled', $config['ehorus_enabled'])))
 					$error_update[] = __('Enable eHorus');