diff --git a/templates/default/login.html b/templates/default/login.html
index 6975a90b3..f093573a6 100644
--- a/templates/default/login.html
+++ b/templates/default/login.html
@@ -16,7 +16,7 @@
         <article class="col-main" role="main" aria-labelledby="main-label">
             <h1 id="main-label" class="page-header">{intl l="Login"}</h1>
             {form name="thelia.customer.login"}
-            <form id="form-login" action="{url path="/login"}" method="post" role="form" {form_enctype form=$form}>
+            <form id="form-login" action="{url path="/login"}" method="post" role="form" novalidate {form_enctype form=$form}>
                 {if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
                 {form_field form=$form field='success_url'}
                     <input type="hidden" name="{$name}" value="{navigate to="return_to"}"> {* the url the user is redirected to on login success *}
@@ -31,10 +31,12 @@
                         <div class="form-group group-email{if $error} has-error{/if}">
                             <label for="{$label_attr.for}">{$label}</label>
                             <div class="control-input">
-                            <input type="email" name="{$name}" id="{$label_attr.for}" value="{$value}" class="form-control" {$attr} {if $required}aria-required="true" required{/if}{if $error} autofocus{/if}>
+                            <input type="email" name="{$name}" id="{$label_attr.for}" value="{$value}" class="form-control" {$attr} {if $required}aria-required="true" required{/if}{if !$value || $error} autofocus{/if}>
                             {if $error}
                                 <span class="help-block"><span class="icon-remove"></span> {$message}</span>
-                                {assign var="error_email" value="true"}
+                                {assign var="error_focus" value="true"}
+                            {elseif !$value}
+                                {assign var="error_focus" value="true"}
                             {/if}
                             </div>
                         </div>
@@ -55,7 +57,7 @@
                         <div class="form-group group-password{if $error} has-error{/if}">
                             <label for="{$label_attr.for}" class="sr-only">{$label}</label>
                             <div class="control-input">
-                            <input type="password" name="{$name}" id="{$label_attr.for}" class="form-control" autocomplete="off"{if !isset($error_email) && $error } autofocus{/if}>
+                            <input type="password" name="{$name}" id="{$label_attr.for}" class="form-control" autocomplete="off"{if !isset($error_focus)} autofocus{/if}>
                             {if $error}
                                 <span class="help-block"><span class="icon-remove"></span> {$message}</span>
                             {/if}