diff --git a/templates/web/account/change-password.html.twig b/templates/web/account/change-password.html.twig
index 8748eaf82d..cf5ed7dc57 100644
--- a/templates/web/account/change-password.html.twig
+++ b/templates/web/account/change-password.html.twig
@@ -54,8 +54,10 @@
 
 {% block scripts %}
     {{ parent() }}
-    <script type="text/javascript" src="{{ path('minifier', {'f': '/scripts/apps/login/home/renewPassword.js'}) }}"></script>
     <script>
+        authenticateApp.bootstrap({
+            state: 'changePassword'
+        });
         // cross-browser asynchronous script loading for zxcvbn.
         // adapted from http://friendlybit.com/js/lazy-loading-asyncronous-javascript/
         (function() {
diff --git a/templates/web/account/reset-email.html.twig b/templates/web/account/reset-email.html.twig
index 8969a60298..061e28b778 100644
--- a/templates/web/account/reset-email.html.twig
+++ b/templates/web/account/reset-email.html.twig
@@ -62,5 +62,11 @@
 
 {% block scripts %}
     {{ parent() }}
-    <script type="text/javascript" src="{{ path('minifier', {'f': 'assets/vendors/requirejs/require.min.js,/scripts/apps/login/home/config.js,/scripts/apps/login/home/renewEmail.js'}) }}"></script>
+    <script type="text/javascript" src="/assets/production/commons{% if not app.debug %}.min{% endif %}.js"></script>
+    <script type="text/javascript" src="/assets/production/authenticate{% if not app.debug %}.min{% endif %}.js"></script>
+    <script>
+        authenticateApp.bootstrap({
+            state: 'renewEmail'
+        })
+    </script>
 {% endblock %}
diff --git a/templates/web/login/forgot-password.html.twig b/templates/web/login/forgot-password.html.twig
index 14985c8379..c88524e48f 100644
--- a/templates/web/login/forgot-password.html.twig
+++ b/templates/web/login/forgot-password.html.twig
@@ -55,5 +55,9 @@
 
 {% block scripts %}
     {{ parent() }}
-    <script type="text/javascript" src="{{ path('minifier', {'f': 'scripts/apps/login/home/forgotPassword.js'}) }}"></script>
+    <script>
+        authenticateApp.bootstrap({
+            state: 'forgotPassword'
+        });
+    </script>
 {% endblock %}
diff --git a/templates/web/login/include/galleria.html.twig b/templates/web/login/include/galleria.html.twig
index 310b86208a..f2162da8d1 100644
--- a/templates/web/login/include/galleria.html.twig
+++ b/templates/web/login/include/galleria.html.twig
@@ -3,23 +3,9 @@
         <img src="{{ item['permalink'].get_url() }}" />
     {% endfor %}
 </div>
-
+<script type="text/javascript" src="/assets/vendors/jquery-galleria/galleria.min.js"></script>
 <script type="text/javascript">
-    requirejs.config({
-        paths: {
-            'galleria' : '../assets/vendors/jquery-galleria/galleria.min'
-        },
-        shim: {
-            'galleria': {
-                deps: ['jquery'],
-                exports: 'Galleria'
-            }
-        }
-    });
-
-    require(["jquery", "galleria"], function($, Galleria) {
-        Galleria.loadTheme('/assets/vendors/jquery-galleria/galleria.classic.min.js');
-        Galleria.run("#galleria");
-        $("#galleria").removeClass("hidden");
-    });
+    Galleria.loadTheme('/assets/vendors/jquery-galleria/galleria.classic.min.js');
+    Galleria.run("#galleria");
+    $("#galleria").removeClass("hidden");
 </script>
diff --git a/templates/web/login/index.html.twig b/templates/web/login/index.html.twig
index 2c368e1773..67aad20f7c 100644
--- a/templates/web/login/index.html.twig
+++ b/templates/web/login/index.html.twig
@@ -155,5 +155,9 @@
 
 {% block scripts %}
     {{ parent() }}
-    <script type="text/javascript" src="{{ path('minifier', {'f': 'scripts/apps/login/home/login.js'}) }}"></script>
+    <script>
+        authenticateApp.bootstrap({
+            state: 'login'
+        });
+    </script>
 {% endblock %}
diff --git a/templates/web/login/layout/base-layout.html.twig b/templates/web/login/layout/base-layout.html.twig
index c3a1dfab42..bd2b5b9e03 100644
--- a/templates/web/login/layout/base-layout.html.twig
+++ b/templates/web/login/layout/base-layout.html.twig
@@ -42,46 +42,13 @@
 
                 {# include backbone templates #}
                 {% include "login/common/templates.html.twig" %}
-                <script type="text/javascript" src="/assets/authentication/js/authentication{% if not app.debug %}.min{% endif %}.js"></script>
+            <script type="text/javascript" src="/assets/vendors/jquery/jquery{% if not app.debug %}.min{% endif %}.js"></script>
+            <script type="text/javascript" src="/assets/production/commons{% if not app.debug %}.min{% endif %}.js"></script>
+            <script type="text/javascript" src="/assets/production/authenticate{% if not app.debug %}.min{% endif %}.js"></script>
             {% endblock header_javascript %}
         {% endblock header %}
     </head>
     <body>
-        {% block google_chrome_frame %}
-        <!--[if lt IE 7]>
-            <div class="ie6-special">
-                <div class="ie6-container">
-                    <table>
-                        <tr>
-                            <td style="width:350px;">
-                                <img src="/assets/authentication/images/ie6dead.png" />
-                            </td>
-                            <td>
-                                <h1>
-                                    {% block main_title %}{% endblock %}
-                                </h1>
-                                <p>
-                                    {% trans %}Mettez à jour votre navigateur ou téléchargez un navigateur plus récent.{% endtrans %}
-                                </p>
-                                <p>
-                                    {% trans %}Si vous ne pouvez pas installer un autre navigateur, utilisez Google Chrome Frame.{% endtrans %}
-                                </p>
-                                <p class="links">
-                                    <a href="https://www.google.com/chrome">
-                                        {% trans %}Installer Google Chrome{% endtrans %}
-                                    </a><br/>
-                                    <a href="https://www.google.com/chromeframe">
-                                        {% trans %}Installer Google Chrome Frame{% endtrans %}
-                                    </a>
-                                </p>
-                            </td>
-                        </tr>
-                    </table>
-                </div>
-            </div>
-        <![endif]-->
-        {% endblock google_chrome_frame %}
-
         {% block container %}
             <div class="container">
                 {% block content_scaffholding %}{% endblock %}
diff --git a/templates/web/login/oauth/login.html.twig b/templates/web/login/oauth/login.html.twig
index bc5541c2d3..b9fd22bb06 100644
--- a/templates/web/login/oauth/login.html.twig
+++ b/templates/web/login/oauth/login.html.twig
@@ -124,5 +124,9 @@
 
 {% block scripts %}
     {{ parent() }}
-    <script type="text/javascript" src="{{ path('minifier', {'f': 'scripts/apps/login/home/oauthLogin.js'}) }}"></script>
+    <script>
+        authenticateApp.bootstrap({
+            state: 'login'
+        })
+    </script>
 {% endblock %}
diff --git a/templates/web/login/providers/bind.html.twig b/templates/web/login/providers/bind.html.twig
index 834a4af026..dd3dbecffa 100644
--- a/templates/web/login/providers/bind.html.twig
+++ b/templates/web/login/providers/bind.html.twig
@@ -83,5 +83,9 @@
 
 {% block scripts %}
     {{ parent() }}
-    <script type="text/javascript" src="{{ path('minifier', {'f': 'scripts/apps/login/home/bind.js'}) }}"></script>
+    <script>
+        authenticateApp.bootstrap({
+            state: 'login'
+        });
+    </script>
 {% endblock %}
diff --git a/templates/web/login/providers/mapping.html.twig b/templates/web/login/providers/mapping.html.twig
index e66b74cecc..0db5a43f24 100644
--- a/templates/web/login/providers/mapping.html.twig
+++ b/templates/web/login/providers/mapping.html.twig
@@ -113,5 +113,9 @@
 
 {% block scripts %}
     {{ parent() }}
-    <script type="text/javascript" src="{{ path('minifier', {'f': 'scripts/apps/login/home/mapping.js'}) }}"></script>
+    <script>
+        authenticateApp.bootstrap({
+            state: 'login'
+        })
+    </script>
 {% endblock %}
diff --git a/templates/web/login/register-classic.html.twig b/templates/web/login/register-classic.html.twig
index d2fb4c516e..6f02238dc0 100644
--- a/templates/web/login/register-classic.html.twig
+++ b/templates/web/login/register-classic.html.twig
@@ -105,30 +105,9 @@
 
 {% block scripts %}
     {{ parent() }}
-    <script type="text/javascript" src="{{ path('minifier', {'f': '/scripts/apps/login/home/register.js'}) }}"></script>
     <script>
-        // cross-browser asynchronous script loading for zxcvbn.
-        // adapted from http://friendlybit.com/js/lazy-loading-asyncronous-javascript/
-        (function() {
-
-            var ZXCVBN_SRC = 'assets/vendors/zxcvbn/zxcvbn{% if not app.debug %}.min{% endif %}.js';
-
-            var async_load = function() {
-                var first, s;
-                s = document.createElement('script');
-                s.src = ZXCVBN_SRC;
-                s.type = 'text/javascript';
-                s.async = true;
-                first = document.getElementsByTagName('script')[0];
-                return first.parentNode.insertBefore(s, first);
-            };
-
-            if (window.attachEvent != null) {
-                window.attachEvent('onload', async_load);
-            } else {
-                window.addEventListener('load', async_load, false);
-            }
-
-        }).call(this);
+        authenticateApp.bootstrap({
+            state: 'register'
+        });
     </script>
 {% endblock %}
diff --git a/templates/web/login/register-provider.html.twig b/templates/web/login/register-provider.html.twig
index d17c697107..54b9fbfe7b 100644
--- a/templates/web/login/register-provider.html.twig
+++ b/templates/web/login/register-provider.html.twig
@@ -91,5 +91,9 @@
 
 {% block scripts %}
     {{ parent() }}
-    <script type="text/javascript" src="{{ path('minifier', {'f': 'scripts/apps/login/home/registerProvider.js'}) }}"></script>
+    <script>
+        authenticateApp.bootstrap({
+            state: 'registerProvider'
+        });
+    </script>
 {% endblock %}
diff --git a/templates/web/login/renew-password.html.twig b/templates/web/login/renew-password.html.twig
index 17100c360e..8e0498154c 100644
--- a/templates/web/login/renew-password.html.twig
+++ b/templates/web/login/renew-password.html.twig
@@ -50,30 +50,9 @@
 
 {% block scripts %}
     {{ parent() }}
-    <script type="text/javascript" src="{{ path('minifier', {'f': '/scripts/apps/login/home/recoverPassword.js'}) }}"></script>
     <script>
-        // cross-browser asynchronous script loading for zxcvbn.
-        // adapted from http://friendlybit.com/js/lazy-loading-asyncronous-javascript/
-        (function() {
-
-            var ZXCVBN_SRC = 'assets/vendors/zxcvbn/zxcvbn{% if not app.debug %}.min{% endif %}.js';
-
-            var async_load = function() {
-                var first, s;
-                s = document.createElement('script');
-                s.src = ZXCVBN_SRC;
-                s.type = 'text/javascript';
-                s.async = true;
-                first = document.getElementsByTagName('script')[0];
-                return first.parentNode.insertBefore(s, first);
-            };
-
-            if (window.attachEvent != null) {
-                window.attachEvent('onload', async_load);
-            } else {
-                window.addEventListener('load', async_load, false);
-            }
-
-        }).call(this);
+        authenticateApp.bootstrap({
+            state: 'renewPassword'
+        });
     </script>
 {% endblock %}