diff --git a/system/pages/account/create.php b/system/pages/account/create.php
index 3ce638d1..49302502 100644
--- a/system/pages/account/create.php
+++ b/system/pages/account/create.php
@@ -26,8 +26,13 @@ if(config('account_create_character_create')) {
 }
 
 $account_type = 'number';
-if(USE_ACCOUNT_NAME) {
-	$account_type = 'name';
+if (config('account_login_by_email')) {
+	$account_type = 'Email Address';
+}
+else {
+	if(USE_ACCOUNT_NAME) {
+		$account_type = 'name';
+	}
 }
 
 $errors = array();
diff --git a/system/templates/account.management.html.twig b/system/templates/account.management.html.twig
index b8e9aae0..80d60006 100644
--- a/system/templates/account.management.html.twig
+++ b/system/templates/account.management.html.twig
@@ -89,10 +89,12 @@
 		<a name="General+Information"></a>
 		<h2>General Information</h2>
 		<table width="100%">
+			{% if not config.account_login_by_email or config.account_login_by_email_fallback %}
 			<tr style="background-color: {{ config.lightborder }};" >
 				<td style="width: 90px;">Account {% if constant('USE_ACCOUNT_NAME') %}Name{% else %}Number{% endif %}:</td>
 				<td>{{ account }}</td>
 			</tr>
+			{% endif %}
 			<tr style="background-color: {{ config.darkborder }};" >
 				<td style="width: 90px;">Email Address:</td>
 				<td>{{ account_email ~ email_change }}
@@ -206,4 +208,4 @@
 			</tr>
 		</table>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/tibiacom/account.management.html.twig b/templates/tibiacom/account.management.html.twig
index b0abb76d..4b39abd8 100644
--- a/templates/tibiacom/account.management.html.twig
+++ b/templates/tibiacom/account.management.html.twig
@@ -146,10 +146,12 @@
 								<div class="TableContentAndRightShadow" style="background-image:url({{ template_path }}/images/content/table-shadow-rm.gif);">
 									<div class="TableContentContainer">
 										<table class="TableContent" width="100%">
+											{% if not config.account_login_by_email or config.account_login_by_email_fallback %}
 											<tr style="background-color: {{ config.lightborder }};" >
 												<td class="LabelV" >Account {% if constant('USE_ACCOUNT_NAME') %}Name{% else %}Number{% endif %}:</td>
 												<td style="width:90%;" >{{ account }}</td>
 											</tr>
+											{% endif %}
 											<tr style="background-color: {{ config.darkborder }};" >
 												<td class="LabelV" >Email Address:</td>
 												<td style="width:90%;" >{{ account_email ~ email_change}}</td>
@@ -516,4 +518,4 @@
 		</tr>
 	</table>
 </div>
-<br/><br/>
\ No newline at end of file
+<br/><br/>