diff --git a/system/templates/account.login.html.twig b/system/templates/account.login.html.twig
index aec1e222..6ab08df9 100644
--- a/system/templates/account.login.html.twig
+++ b/system/templates/account.login.html.twig
@@ -29,7 +29,7 @@ Please enter your account {{ account|lower }} and your password.<br/><a href="{{
 								<td class="LabelV" >
 									<span{% if error is not null %} class="red"{% endif %}>{{ account_login_by }}:</span>
 								</td>
-								<td style="width:100%;" ><input type="text" name="account_login" size="30" maxlength="30" autofocus/></td>
+								<td style="width:100%;" ><input type="text" name="account_login" size="30" maxlength="{{ setting('core.account_login_by_email') ? '255' : '30' }}" autofocus/></td>
 							</tr>
 							{{ hook('HOOK_ACCOUNT_LOGIN_AFTER_ACCOUNT') }}
 							<tr>
diff --git a/system/templates/admin.login.html.twig b/system/templates/admin.login.html.twig
index 4f766f9a..f31b8fad 100644
--- a/system/templates/admin.login.html.twig
+++ b/system/templates/admin.login.html.twig
@@ -24,7 +24,7 @@
 						<div class="input-group-prepend">
 							<span class="input-group-text"><i class="fa fa-lock"></i></span>
 						</div>
-						<input type="text" class="form-control" id="account-name-input" name="account_login" placeholder="{{ account_login_by }}" required autofocus>
+						<input type="text" class="form-control" id="account-name-input" name="account_login" maxlength="{{ setting('core.account_login_by_email') ? '255' : '30' }}" placeholder="{{ account_login_by }}" required autofocus>
 					</div>
 					{{ hook('HOOK_ADMIN_LOGIN_AFTER_ACCOUNT') }}
 					<div class="input-group mb-3">
diff --git a/templates/tibiacom/account.login.html.twig b/templates/tibiacom/account.login.html.twig
index 3e459a8b..9e9b65c2 100644
--- a/templates/tibiacom/account.login.html.twig
+++ b/templates/tibiacom/account.login.html.twig
@@ -38,7 +38,7 @@
 																<td class="LabelV">
 																	<span{% if error is not null %} class="red"{% endif %}>{{ account_login_by }}:</span>
 																</td>
-																<td><input type="text" name="account_login" size="35" maxlength="30" autofocus /></td>
+																<td><input type="text" name="account_login" size="35" maxlength="{{ setting('core.account_login_by_email') ? '255' : '30' }}" autofocus /></td>
 															</tr>
 															{{ hook('HOOK_ACCOUNT_LOGIN_AFTER_ACCOUNT') }}
 															<tr>