diff --git a/system/init.php b/system/init.php
index ec61b459e..8e0871399 100644
--- a/system/init.php
+++ b/system/init.php
@@ -157,13 +157,6 @@
 
 date_default_timezone_set(setting('core.date_timezone'));
 
-setting(
-	[
-		'core.account_create_character_create',
-		setting('core.account_create_character_create') && (!setting('core.mail_enabled') || !setting('core.account_mail_verify'))
-	]
-);
-
 $settingsItemImagesURL = setting('core.item_images_url');
 if($settingsItemImagesURL[strlen($settingsItemImagesURL) - 1] !== '/') {
 	setting(['core.item_images_url', $settingsItemImagesURL . '/']);
diff --git a/system/pages/account/create.php b/system/pages/account/create.php
index 6895bba91..0074f9e35 100644
--- a/system/pages/account/create.php
+++ b/system/pages/account/create.php
@@ -255,15 +255,6 @@
 		}
 		else
 		{
-			if(setting('core.account_create_character_create')) {
-				// character creation
-				$character_created = $createCharacter->doCreate($character_name, $character_sex, $character_vocation, $character_town, $new_account, $errors);
-				if (!$character_created) {
-					error('There was an error creating your character. Please create your character later in account management page.');
-					error(implode(' ', $errors));
-				}
-			}
-
 			if(setting('core.account_create_auto_login')) {
 				if ($hasBeenCreatedByEMail) {
 					$_POST['account_login'] = $email;
@@ -314,6 +305,15 @@
 			}
 		}
 
+		if(setting('core.account_create_character_create')) {
+			// character creation
+			$character_created = $createCharacter->doCreate($character_name, $character_sex, $character_vocation, $character_town, $new_account, $errors);
+			if (!$character_created) {
+				error('There was an error creating your character. Please create your character later in account management page.');
+				error(implode(' ', $errors));
+			}
+		}
+
 		return;
 	}
 }
diff --git a/system/templates/account.create.html.twig b/system/templates/account.create.html.twig
index 300b700ae..2e5267e2d 100644
--- a/system/templates/account.create.html.twig
+++ b/system/templates/account.create.html.twig
@@ -110,7 +110,7 @@
 
 			{{ hook('HOOK_ACCOUNT_CREATE_BETWEEN_BOXES_1') }}
 
-			{% if (not setting('core.mail_enabled') or not setting('core.account_mail_verify')) and setting('core.account_create_character_create') %}
+			{% if setting('core.account_create_character_create') %}
 			<tr>
 				<td>
 					<div class="TableShadowContainerRightTop">