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 9c36bb5d49..8835ac22c2 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
@@ -4,55 +4,70 @@
     <h2 class="ez-login__actions-headline">{{ 'base.sign_in'|trans|desc('Sign in to IBEXA DXP') }}</h2>
     <p class="ez-login__actions-subheadline">{{ 'base.enter_credentials'|trans|desc('Enter your login credentials below.') }}</p>
 
-    <form action="{{ path( 'login_check' ) }}" method="post" role="form">
-        <fieldset>
-            {% if error %}
-                <span class="ez-login__errors-container">{{ error.message|trans }}</span>
-            {% endif %}
-            <div class="form-group{% if error %} has-error{% endif %}">
-                <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"
-                    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') }}" 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"
-                    required="required"
-                    tabindex="2"
-                />
-                <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="{{ ez_icon_path('view') }}"></use>
-                    </svg>
-                    <svg class="ez-icon ez-icon--medium ez-icon--dark ez-icon--view-hide d-none">
-                        <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="{{ ez_icon_path('view-hide') }}"></use>
-                    </svg>
-                </button>
-            </div>
-
-            <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" tabindex="3">{{ 'authentication.sign_in'|trans|desc('Sign in') }}</button>
-        </fieldset>
-    </form>
+    {% block login_form %}
+        {{ ez_render_component_group('login-form-before') }}
+
+        <form action="{{ path( 'login_check' ) }}" method="post" role="form">
+            <fieldset>
+                {% block login_form_errors %}
+                    {% if error %}
+                        <span class="ez-login__errors-container">{{ error.message|trans }}</span>
+                    {% endif %}
+                {% endblock %}
+
+                {% block login_form_fields %}
+                    <div class="form-group{% if error %} has-error{% endif %}">
+                        <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"
+                            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') }}" 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"
+                            required="required"
+                            tabindex="2"
+                        />
+                        <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="{{ ez_icon_path('view') }}"></use>
+                            </svg>
+                            <svg class="ez-icon ez-icon--medium ez-icon--dark ez-icon--view-hide d-none">
+                                <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="{{ ez_icon_path('view-hide') }}"></use>
+                            </svg>
+                        </button>
+                    </div>
+
+                    <input type="hidden" name="_csrf_token" value="{{ csrf_token("authenticate") }}" />
+                {% endblock %}
+
+                {% block login_form_buttons %}
+                    <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>
+                {% endblock %}
+            </fieldset>
+        </form>
+
+        {{ ez_render_component_group('login-form-after') }}
+    {% endblock %}
 
     {{ encore_entry_script_tags('ezplatform-admin-ui-login-js', null, 'ezplatform') }}
 {%- endblock content -%}