diff --git a/system/config.php b/system/config.php
index 48d0a9d0..5c780334 100644
--- a/system/config.php
+++ b/system/config.php
@@ -29,8 +29,6 @@ $config = array(
 	//
 	'generate_new_reckey' => true,				// let player generate new recovery key, he will receive e-mail with new rec key (not display on page, hacker can't generate rec key)
 	'generate_new_reckey_price' => 20,			// price for new recovery key
-	'send_mail_when_change_password' => true,	// send e-mail with new password when change password to account
-	'send_mail_when_generate_reckey' => true,	// send e-mail with rec key (key is displayed on page anyway when generate)
 
 	// new character config
 	'character_samples' => array( // vocations, format: ID_of_vocation => 'Name of Character to copy'
diff --git a/system/pages/account/change_password.php b/system/pages/account/change_password.php
index 6c4afb29..95e15159 100644
--- a/system/pages/account/change_password.php
+++ b/system/pages/account/change_password.php
@@ -69,7 +69,7 @@ else
 		$account_logged->logAction('Account password changed.');
 
 		$message = '';
-		if(setting('core.mail_enabled') && $config['send_mail_when_change_password']) {
+		if(setting('core.mail_enabled') && setting('core.mail_send_when_change_password')) {
 			$mailBody = $twig->render('mail.password_changed.html.twig', array(
 				'new_password' => $org_pass,
 				'ip' => get_browser_real_ip(),
@@ -89,4 +89,4 @@ else
 		));
 		setSession('password', $new_password);
 	}
-}
\ No newline at end of file
+}
diff --git a/system/pages/account/register.php b/system/pages/account/register.php
index 2d024dd7..f33f0b17 100644
--- a/system/pages/account/register.php
+++ b/system/pages/account/register.php
@@ -31,7 +31,7 @@ if(isset($_POST['registeraccountsave']) && $_POST['registeraccountsave'] == "1")
 			$account_logged->logAction('Generated recovery key.');
 			$message = '';
 
-			if(setting('core.mail_enabled') && $config['send_mail_when_generate_reckey'])
+			if(setting('core.mail_enabled') && setting('core.mail_send_when_generate_reckey'))
 			{
 				$mailBody = $twig->render('mail.account.register.html.twig', array(
 					'recovery_key' => $new_rec_key
diff --git a/system/settings.php b/system/settings.php
index 9b0f313b..bf592e7b 100644
--- a/system/settings.php
+++ b/system/settings.php
@@ -484,6 +484,49 @@ Sent by MyAAC,<br/>
 				'mail_enabled', '=', 'true'
 			]
 		],
+		'mail_other' => [
+			'type' => 'section',
+			'title' => 'Account E-Mails',
+			'show_if' => [
+				'mail_enabled', '=', 'true'
+			],
+		],
+		'account_welcome_mail' => [
+			'name' => 'Account Welcome E-Mail',
+			'type' => 'boolean',
+			'desc' => 'Send welcome e-mail when user registers',
+			'default' => true,
+			'show_if' => [
+				'mail_enabled', '=', 'true'
+			],
+		],
+		'account_mail_verify' => [
+			'name' => 'Account E-Mail Verify',
+			'type' => 'boolean',
+			'desc' => 'Force users to confirm their e-mail addresses when registering account',
+			'default' => false,
+			'show_if' => [
+				'mail_enabled', '=', 'true'
+			],
+		],
+		'mail_send_when_change_password' => [
+			'name' => 'Change Password E-Mail',
+			'type' => 'boolean',
+			'desc' => 'Send e-mail with new password when change password to account',
+			'default' => true,
+			'show_if' => [
+				'mail_enabled', '=', 'true',
+			],
+		],
+		'mail_send_when_generate_reckey' => [
+			'name' => 'Generate Recovery Key E-Mail',
+			'type' => 'boolean',
+			'desc' => 'Send e-mail with recovery key (key is displayed on page anyway when generate)',
+			'default' => true,
+			'show_if' => [
+				'mail_enabled', '=', 'true',
+			],
+		],
 		[
 			'type' => 'category',
 			'title' => 'Accounts',
@@ -522,12 +565,6 @@ Sent by MyAAC,<br/>
 			'desc' => 'Allow to create character directly on create account page?',
 			'default' => true,
 		],
-		'account_mail_verify' => [
-			'name' => 'Account Mail Verify',
-			'type' => 'boolean',
-			'desc' => 'Force users to confirm their email addresses when registering account',
-			'default' => false,
-		],
 		'account_mail_unique' => [
 			'name' => 'Account Mail Unique',
 			'type' => 'boolean',
@@ -546,12 +583,6 @@ Sent by MyAAC,<br/>
 			'desc' => 'Default premium points on new account',
 			'default' => 0,
 		],
-		'account_welcome_mail' => [
-			'name' => 'Account Welcome Mail',
-			'type' => 'boolean',
-			'desc' => 'Send welcome email when user registers',
-			'default' => true,
-		],
 		'account_mail_change' => [
 			'name' => 'Account Mail Change Days',
 			'type' => 'number',