diff --git a/modules/core/templates/loginuserpass.twig b/modules/core/templates/loginuserpass.twig
index 17646506daa9672b3aff822a2c37d267d1124c32..59529528bdd73e15438da7a2e5cf4e1378284f63 100644
--- a/modules/core/templates/loginuserpass.twig
+++ b/modules/core/templates/loginuserpass.twig
@@ -98,13 +98,15 @@
 
             </div> <!-- form-align-->
             <br><br>
-            <button class="pure-button pure-button-red pure-input-1-2 pure-input-sm-1-1 right" id="submit_button" type="submit" tabindex="6">
-                {{ 'Login'|trans }}
-            </button>
-            <input type='hidden' id="processing_trans" value="{{ 'Processing...'|trans }}" />
-            {% for name, value in stateparams -%}
-                <input type="hidden" name="{{ name }}" value="{{ value }}" />
+            {%- for name, value in stateparams %}
+
+            <input type="hidden" name="{{ name }}" value="{{ value }}"/>
             {%- endfor %}
+
+            <button class="pure-button pure-button-red pure-input-1-2 pure-input-sm-1-1 right" id="submit_button"
+                    type="submit" tabindex="6" data-processing="{% trans %}Processing...{% endtrans %}">
+              {% trans %}Log in{% endtrans %}
+            </button>
         </form>
     </div><!--center-->
     {% if links -%}
diff --git a/modules/core/www/assets/js/loginuserpass.js b/modules/core/www/assets/js/loginuserpass.js
index e475e8ca6ec6a497dc7159695c82e2806d463906..eda96028643e38df1b1f0b5d22083500c508f173 100644
--- a/modules/core/www/assets/js/loginuserpass.js
+++ b/modules/core/www/assets/js/loginuserpass.js
@@ -1,15 +1,6 @@
-document.addEventListener(
-    'DOMContentLoaded',
-    function () {
-        var button = document.getElementById("submit_button");
-        button.addEventListener(
-            'click',
-            function () {
-                var translation = document.getElementById("processing_trans");
-                this.disabled = true;
-                this.innerHTML = translation.value;
-                return true;
-            }
-        );
-    }
-);
+$(document).ready(function () {
+    $('#submit_button').on('click', function () {
+        $(this).attr('disabled', 'disabled');
+        $(this).html($(this).data('processing'));
+    });
+});