diff --git a/src/bundle/Resources/public/scss/_login.scss b/src/bundle/Resources/public/scss/_login.scss
index 1b7f99e02e..2156508c00 100644
--- a/src/bundle/Resources/public/scss/_login.scss
+++ b/src/bundle/Resources/public/scss/_login.scss
@@ -15,7 +15,7 @@
         position: relative;
         display: flex;
         flex-direction: column;
-        background-image: url("/bundles/ezplatformadminui/img/login-background.jpg");
+        background-image: url('/bundles/ezplatformadminui/img/login-background.jpg');
     }
 
     &__support-wrapper {
@@ -26,7 +26,7 @@
     &__support-headline {
         font-weight: 600;
         font-size: calculateRem(24px);
-        margin-bottom: calculateRem(24px)
+        margin-bottom: calculateRem(24px);
     }
 
     &__support-content {
@@ -118,6 +118,10 @@
         &--reset-password {
             padding: calculateRem(10px) calculateRem(80px);
         }
+
+        &--cancel {
+            padding: calculateRem(10px) calculateRem(24px);
+        }
     }
 
     &__copright {
diff --git a/src/bundle/Resources/translations/messages.en.xliff b/src/bundle/Resources/translations/messages.en.xliff
index 83434722e4..05cc07c4b5 100644
--- a/src/bundle/Resources/translations/messages.en.xliff
+++ b/src/bundle/Resources/translations/messages.en.xliff
@@ -51,16 +51,16 @@
         <target state="new">Reset your password</target>
         <note>key: authentication.reset_your_password</note>
       </trans-unit>
+      <trans-unit id="21689a7153c422f3a4d27fa44d04d6708842a194" resname="authentication.reset_your_password.cancel">
+        <source>Cancel</source>
+        <target state="new">Cancel</target>
+        <note>key: authentication.reset_your_password.cancel</note>
+      </trans-unit>
       <trans-unit id="daab336a9cb12d2d04146c55228268227cf1017a" resname="authentication.sign_in">
         <source>Sign in</source>
         <target state="new">Sign in</target>
         <note>key: authentication.sign_in</note>
       </trans-unit>
-      <trans-unit id="8785f4abdfdf72fe9001fe0553c6e3a582cfcc08" resname="authentication.submit">
-        <source>Login</source>
-        <target state="new">Login</target>
-        <note>key: authentication.submit</note>
-      </trans-unit>
       <trans-unit id="9143793289ea0e20c3dc9f752d43cc727f2dba01" resname="authentication.username">
         <source>Username</source>
         <target state="new">Username</target>
@@ -81,11 +81,6 @@
         <target state="new">Need assistance or support?</target>
         <note>key: base.need_assistance</note>
       </trans-unit>
-      <trans-unit id="d51e30462e1babe35fd4fc6bcbbe6faf5e065b32" resname="base.platform_by_ibexa">
-        <source>platform by Ibexa</source>
-        <target state="new">platform by Ibexa</target>
-        <note>key: base.platform_by_ibexa</note>
-      </trans-unit>
       <trans-unit id="b5305384fa0fd949ec756891f50f093fd26dd06c" resname="base.sign_in">
         <source>Sign in to IBEXA DXP</source>
         <target state="new">Sign in to IBEXA DXP</target>
@@ -186,11 +181,6 @@
         <target state="new"><![CDATA[Please contact your Administrator to request access to this content or modify your profile.<br/>Otherwise, go back to <a class="error-page__link" href="%dashboard%">dashboard</a> or <a class="error-page__link" href="%search%">search</a> for another Content item.]]></target>
         <note>key: error.page.403.actions</note>
       </trans-unit>
-      <trans-unit id="2532cb9ce6fdf46258c107f3d20888c506115ef6" resname="error.page.403.message">
-        <source><![CDATA[Error 403: you don't have permissions to access this page.<br/>Contact your Administrator to request access to this content.]]></source>
-        <target state="new"><![CDATA[Error 403: you don't have permissions to access this page.<br/>Contact your Administrator to request access to this content.]]></target>
-        <note>key: error.page.403.message</note>
-      </trans-unit>
       <trans-unit id="d0b5337e551b64f59973449bbdcf7914c2102a6c" resname="error.page.403.sub_title">
         <source>Not possible to retrieve or access this page.</source>
         <target state="new">Not possible to retrieve or access this page.</target>
@@ -211,11 +201,6 @@
         <target state="new"><![CDATA[The page you requested was not found.<br/> It might have been deleted or it is temporarily unavailable.]]></target>
         <note>key: error.page.404.message</note>
       </trans-unit>
-      <trans-unit id="7596368af317fe78b955e2a3f63c7586900bcd76" resname="error.page.404.messagea">
-        <source>The page you requested was not found. It might have been deleted or it is temporarily unavailable.</source>
-        <target state="new">The page you requested was not found. It might have been deleted or it is temporarily unavailable.</target>
-        <note>key: error.page.404.messagea</note>
-      </trans-unit>
       <trans-unit id="ffa7f20226d38a989f6c931264bd4cf485b435e6" resname="error.page.404.sub_title">
         <source>You probably weren't expecting to land here.</source>
         <target state="new">You probably weren't expecting to land here.</target>
@@ -349,11 +334,6 @@
         <target state="new">From date - to date</target>
         <note>key: search.date.range</note>
       </trans-unit>
-      <trans-unit id="03d6d5922fd2012e155e50306eaf98e2dfeb21c6" resname="search.section.any">
-        <source>Any section</source>
-        <target state="new">Any section</target>
-        <note>key: search.section.any</note>
-      </trans-unit>
       <trans-unit id="9567771350aff93580f743089937b0c8fe31058e" resname="section.assign,content">
         <source>Assign Content</source>
         <target state="new">Assign Content</target>
diff --git a/src/bundle/Resources/views/themes/admin/account/forgot_password/index.html.twig b/src/bundle/Resources/views/themes/admin/account/forgot_password/index.html.twig
index 5d41765186..aad5a9bb34 100644
--- a/src/bundle/Resources/views/themes/admin/account/forgot_password/index.html.twig
+++ b/src/bundle/Resources/views/themes/admin/account/forgot_password/index.html.twig
@@ -10,7 +10,9 @@
             {{ form_row(form_forgot_user_password.email, {'attr': {'class': 'form-control ez-login__input'}}) }}
         </fieldset>
         {{ form_widget(form_forgot_user_password.reset, {'attr': {'class': 'btn btn-primary ez-login__btn--reset-password'}}) }}
-
+        <a href="{{ path('login') }}" class="btn ez-btn--secondary ez-login__btn--cancel">
+            {{ 'authentication.reset_your_password.cancel'|trans|desc('Cancel') }}
+        </a>
         {{ form_end(form_forgot_user_password) }}
     {% endif %}
 {%- endblock content -%}
diff --git a/src/bundle/Resources/views/themes/admin/account/login/index.html.twig b/src/bundle/Resources/views/themes/admin/account/login/index.html.twig
index 85d98ca3a7..8c9687ec23 100644
--- a/src/bundle/Resources/views/themes/admin/account/login/index.html.twig
+++ b/src/bundle/Resources/views/themes/admin/account/login/index.html.twig
@@ -13,30 +13,32 @@
                 <div class="ez-login__input-label-wrapper">
                     <label class="ez-login__input-label" for="username">{{ 'authentication.username'|trans|desc('Username') }}</label>
                 </div>
-                <input 
-                    type="text" 
-                    id="username" 
-                    class="form-control ez-login__input ez-login__input--username" 
-                    name="_username" 
-                    value="{{ last_username }}" 
-                    required="required" 
-                    autofocus="autofocus" 
+                <input
+                    type="text"
+                    id="username"
+                    class="form-control ez-login__input ez-login__input--username"
+                    name="_username"
+                    value="{{ last_username }}"
+                    required="required"
+                    autofocus="autofocus"
                     autocomplete="on"
+                    tabindex="1"
                 />
             </div>
             <div class="form-group{% if error %} has-error{% endif %} position-relative">
                 <div class="ez-login__input-label-wrapper">
                     <label class="ez-login__input-label" for="password">{{ 'authentication.password'|trans|desc('Password') }}</label>
-                    <a href="{{ path('ezplatform.user.forgot_password') }}">{{ 'authentication.forgot_password'|trans|desc('Forgot password?') }}</a>
+                    <a href="{{ path('ezplatform.user.forgot_password') }}" tabindex="4">{{ 'authentication.forgot_password'|trans|desc('Forgot password?') }}</a>
                 </div>
-                <input 
-                    type="password" 
-                    id="password" 
-                    class="form-control ez-login__input ez-login__input--password" 
-                    name="_password" 
+                <input
+                    type="password"
+                    id="password"
+                    class="form-control ez-login__input ez-login__input--password"
+                    name="_password"
                     required="required"
+                    tabindex="2"
                 />
-                <button type="button" class="ez-login__password-visibility-toggler">
+                <button type="button" class="ez-login__password-visibility-toggler" tabindex="5">
                     <svg class="ez-icon ez-icon--medium ez-icon--dark ez-icon--view">
                         <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="{{ asset('bundles/ezplatformadminui/img/ez-icons.svg#view') }}"></use>
                     </svg>
@@ -48,7 +50,7 @@
 
             <input type="hidden" name="_csrf_token" value="{{ csrf_token("authenticate") }}" />
 
-            <button type="submit" class="btn btn-primary ez-login__btn ez-login__btn--sign-in">{{ 'authentication.sign_in'|trans|desc('Sign in') }}</button>
+            <button type="submit" class="btn btn-primary ez-login__btn ez-login__btn--sign-in" tabindex="3">{{ 'authentication.sign_in'|trans|desc('Sign in') }}</button>
         </fieldset>
     </form>