diff --git a/templates/web/login/forgot-password.html.twig b/templates/web/login/forgot-password.html.twig
index 4bd2e684d9..977b6c2905 100644
--- a/templates/web/login/forgot-password.html.twig
+++ b/templates/web/login/forgot-password.html.twig
@@ -22,19 +22,18 @@
             <div class="span12">
                 {{ auth_macro.flashes() }}
                 <form
-                    ng-controller="forgottenPasswordFormCtrl"
                     novalidate
                     name="forgottenPasswordForm"
-                    ng-submit="submit();"
                     action="{{ path("login_forgot_password") }}"
                     method="POST"
-                    check-form-submission
                 >
-                    <div class="row-fluid">
-                        <div class="span12">
-                            {{ form_errors(form) }}
+                    {% if form.vars.errors|length > 0 %}
+                        <div class="row-fluid">
+                            <div class="span12">
+                                {{ form_errors(form) }}
+                            </div>
                         </div>
-                    </div>
+                    {% endif %}
                     <div class="row-fluid">
                         <div class="span12">
                             {{ auth_macro.fieldInput(form.email, "forgottenPasswordForm", "icon-envelope") }}
@@ -53,3 +52,8 @@
         </div>
     </div>
 {% endblock %}
+
+{% block scripts %}
+    {{ parent() }}
+    <script type="text/javascript" src="/scripts/apps/login/home/forgotPassword.js"></script>
+{% endblock %}
diff --git a/templates/web/login/index.html.twig b/templates/web/login/index.html.twig
index 9d26ec8cb7..ff81759490 100644
--- a/templates/web/login/index.html.twig
+++ b/templates/web/login/index.html.twig
@@ -16,11 +16,6 @@
     {% endfor %}
 {% endblock %}
 
-{% block header_javascript %}
-    {{ parent() }}
-    {% include "login/common/templates.html.twig" %}
-{% endblock header_javascript %}
-
 {% block sidebar %}
     <div class="well-large sidebar-block">
         <div class="row-fluid">
@@ -52,7 +47,14 @@
                     method="POST"
                     action="{{ path("login_authenticate") }}"
                 >
-                    {{ form_errors(form) }}
+                    {% if form.vars.errors|length > 0 %}
+                        <div class="row-fluid">
+                            <div class="span12">
+                                {{ form_errors(form) }}
+                            </div>
+                        </div>
+                    {% endif %}
+
                     <div class="row-fluid">
                         <div class="span12">
                             {{ auth_macro.fieldInput(form.login, "loginForm", 'icon-envelope') }}
@@ -115,3 +117,8 @@
 {% block left_content %}
     {{ parent() }}
 {% endblock %}
+
+{% block scripts %}
+    {{ parent() }}
+    <script type="text/javascript" src="/scripts/apps/login/home/login.js"></script>
+{% endblock %}
diff --git a/templates/web/login/layout/base-layout.html.twig b/templates/web/login/layout/base-layout.html.twig
index 79d0e731ef..cf5142c555 100644
--- a/templates/web/login/layout/base-layout.html.twig
+++ b/templates/web/login/layout/base-layout.html.twig
@@ -33,6 +33,9 @@
             {% endblock header_stylesheet %}
 
             {% block header_javascript %}
+                {# include backbone templates #}
+                {% include "login/common/templates.html.twig" %}
+
                 <script type="text/javascript" src="{{ path('minifier', {'g' : 'authentication'}) }}"></script>
             {% endblock header_javascript %}
         {% endblock header %}
@@ -91,8 +94,6 @@
         </div><!--/.fluid-container-->
         {% include 'common/analytics.html.twig' %}
 
-        {% block scripts %}
-            <script type="text/javascript" src="/include/minify/?f=/assets/requirejs/require.js,/scripts/apps/login/home/main.js"></script>
-        {% endblock %}
+        {% block scripts %}{% endblock %}
     </body>
 </html>
diff --git a/templates/web/login/register-classic.html.twig b/templates/web/login/register-classic.html.twig
index 565c472221..fdbb5bbaa7 100644
--- a/templates/web/login/register-classic.html.twig
+++ b/templates/web/login/register-classic.html.twig
@@ -31,11 +31,14 @@
                      method="POST"
                      action="{{ path("login_register_classic") }}"
                 >
-                    <div class="row-fluid">
-                        <div class="span12">
-                            {{ form_errors(form) }}
+                    {% if form.vars.errors|length > 0 %}
+                        <div class="row-fluid">
+                            <div class="span12">
+                                {{ form_errors(form) }}
+                            </div>
                         </div>
-                    </div>
+                    {% endif %}
+
                     <div class="row-fluid">
                         <div class="span12">
                             {{ auth_macro.fieldInput(form.email, "registerForm", 'icon-envelope') }}
@@ -50,13 +53,7 @@
 
                     <div class="row-fluid">
                         <div class="span12">
-                            {{ auth_macro.fieldInput(form.passwordConfirm, "registerForm", 'icon-lock', {
-                                    "ui-validate" : " '$value==" ~ form.password.vars.name ~ "' ",
-                                    "ui-validate-watch" : "'" ~ form.password.vars.name ~ "'"
-                                }, {
-                                    "validate_message" : "Passwords do not match"|trans
-                                })
-                            }}
+                            {{ auth_macro.fieldInput(form.passwordConfirm, "registerForm", 'icon-lock') }}
                         </div>
                     </div>
 
@@ -85,7 +82,7 @@
 
                     <div class="row-fluid">
                         <div class="span12">
-                            {{ form_row(form.collections) }}
+                            {{ auth_macro.selectInput(form.collections) }}
                         </div>
                     </div>
 
@@ -111,3 +108,8 @@
         </div>
     </div>
 {% endblock %}
+
+{% block scripts %}
+    {{ parent() }}
+    <script type="text/javascript" src="/scripts/apps/login/home/register.js"></script>
+{% endblock %}
diff --git a/templates/web/login/register-provider.html.twig b/templates/web/login/register-provider.html.twig
index 27dad8a3a7..45b6e06d06 100644
--- a/templates/web/login/register-provider.html.twig
+++ b/templates/web/login/register-provider.html.twig
@@ -32,38 +32,29 @@
         <div class="row-fluid">
             <div class="span12">
                 <form name="registerForm" class="authentication-sidebar-form">
-                    <div class="row-fluid">
-                        <div class="span12">
-                            {{ form_errors(form) }}
+                    {% if form.vars.errors|length > 0 %}
+                        <div class="row-fluid">
+                            <div class="span12">
+                                {{ form_errors(form) }}
+                            </div>
                         </div>
-                    </div>
-                    <div class="row-fluid">
-                        <div class="span12">
-                            {{ auth_macro.fieldInput(form.firstName, "registerForm", 'icon-user') }}
-                        </div>
-                    </div>
-                    <div class="row-fluid">
-                        <div class="span12">
-                            {{ auth_macro.fieldInput(form.lastName, "registerForm", 'icon-user') }}
-                        </div>
-                    </div>
+                    {% endif %}
                     <div class="row-fluid">
                         <div class="span12">
                             {{ auth_macro.fieldInput(form.email, "registerForm", 'icon-envelope') }}
                         </div>
                     </div>
 
-                    <div class="row-fluid">
-                        <div class="span12">
-                            {{ auth_macro.fieldInput(form.company, "registerForm", 'icon-briefcase') }}
-                        </div>
-                    </div>
-
-                    <div class="row-fluid">
-                        <div class="span12">
-                            {{ auth_macro.fieldInput(form.job, "registerForm", 'icon-briefcase') }}
-                        </div>
-                    </div>
+                    {% for field in app['registration.fields'] %}
+                        {% set name = field['name'] %}
+                        {% if name in app['registration.optional-fields']|keys %}
+                            <div class="row-fluid">
+                                <div class="span12">
+                                    {{ auth_macro.fieldInput(attribute(form, name|camelize), "registerForm") }}
+                                </div>
+                            </div>
+                        {% endif %}
+                    {% endfor %}
 
                     <div class="sidebar-hint">
                         * {% trans "Mandatory fields" %}
diff --git a/templates/web/login/renew-password.html.twig b/templates/web/login/renew-password.html.twig
index 46c96f3063..3e29213734 100644
--- a/templates/web/login/renew-password.html.twig
+++ b/templates/web/login/renew-password.html.twig
@@ -19,19 +19,19 @@
             <div class="span12">
                 {{ auth_macro.flashes() }}
                 <form
-                    ng-controller="passwordRenewFormCtrl"
                     novalidate
                     name="passwordRenewForm"
-                    ng-submit="submit();"
                     method="POST"
                     action="{{ path('login_renew_password') }}"
-                    check-form-submission
                 >
-                    <div class="row-fluid">
-                        <div class="span12">
-                            {{ form_errors(form) }}
+                    {% if form.vars.errors|length > 0 %}
+                        <div class="row-fluid">
+                            <div class="span12">
+                                {{ form_errors(form) }}
+                            </div>
                         </div>
-                    </div>
+                    {% endif %}
+
                     <div class="row-fluid">
                         <div class="span12">
                             {{ auth_macro.fieldInput(form.password, "passwordRenewForm", 'icon-lock') }}
@@ -39,13 +39,7 @@
                     </div>
                     <div class="row-fluid">
                         <div class="span12">
-                            {{ auth_macro.fieldInput(form.passwordConfirm, "passwordRenewForm", 'icon-lock', {
-                                    "ui-validate" : " '$value==" ~ form.password.vars.name ~ "' ",
-                                    "ui-validate-watch" : "'" ~ form.password.vars.name ~ "'"
-                                }, {
-                                    "validate_message" : "Passwords do not match"|trans
-                                })
-                            }}
+                            {{ auth_macro.fieldInput(form.passwordConfirm, "passwordRenewForm", 'icon-lock') }}
                         </div>
                     </div>
                     {{ form_rest(form) }}
@@ -61,3 +55,8 @@
         </div>
     </div>
 {% endblock %}
+
+{% block scripts %}
+    {{ parent() }}
+    <script type="text/javascript" src="/scripts/apps/login/home/renewPassword.js"></script>
+{% endblock %}