diff --git a/templates/pages/login.html b/templates/pages/login.html
index d09402227..5b9cf5e36 100644
--- a/templates/pages/login.html
+++ b/templates/pages/login.html
@@ -41,26 +41,26 @@ Please see LICENSE files in the repository root for full details.
       {% endif %}
 
       <input type="hidden" name="csrf" value="{{ csrf_token }}" />
-    
-    {% if features.password_login %}
-      {% if features.login_with_email_allowed %}
-        {% call(f) field.field(label=_("mas.login.username_or_email"), name="username", form_state=form) %}
-          <input {{ field.attributes(f) }} class="cpd-text-control" type="text" autocomplete="username" autocorrect="off" autocapitalize="off" required />
-        {% endcall %}
-      {% else %}
-        {% call(f) field.field(label=_("common.username"), name="username", form_state=form) %}
-          <input {{ field.attributes(f) }} class="cpd-text-control" type="text" autocomplete="username" autocorrect="off" autocapitalize="off" required />
+
+      {% if features.password_login %}
+        {% if features.login_with_email_allowed %}
+          {% call(f) field.field(label=_("mas.login.username_or_email"), name="username", form_state=form) %}
+            <input {{ field.attributes(f) }} class="cpd-text-control" type="text" autocomplete="username" autocorrect="off" autocapitalize="off" required />
+          {% endcall %}
+        {% else %}
+          {% call(f) field.field(label=_("common.username"), name="username", form_state=form) %}
+            <input {{ field.attributes(f) }} class="cpd-text-control" type="text" autocomplete="username" autocorrect="off" autocapitalize="off" required />
+          {% endcall %}
+        {% endif %}
+      
+        {% call(f) field.field(label=_("common.password"), name="password", form_state=form) %}
+          <input {{ field.attributes(f) }} class="cpd-text-control" type="password" autocomplete="password" required />
         {% endcall %}
+
+        {% if features.account_recovery %}
+          {{ button.link_text(text=_("mas.login.forgot_password"), href="/recover", class="self-center") }}
+        {% endif %}
       {% endif %}
-    
-      {% call(f) field.field(label=_("common.password"), name="password", form_state=form) %}
-        <input {{ field.attributes(f) }} class="cpd-text-control" type="password" autocomplete="password" required />
-      {% endcall %}
-    
-      {% if features.account_recovery %}
-        {{ button.link_text(text=_("mas.login.forgot_password"), href="/recover", class="self-center") }}
-      {% endif %}
-    {% endif %}
     </div>
 
     <div class="cpd-form-root">
diff --git a/translations/en.json b/translations/en.json
index a24e1a74c..be76affb2 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -99,7 +99,7 @@
     },
     "username": "Username",
     "@username": {
-      "context": "pages/login.html:50:37-57, pages/register/index.html:30:35-55, pages/register/password.html:34:33-53, pages/upstream_oauth2/do_register.html:101:35-55, pages/upstream_oauth2/do_register.html:107:39-59"
+      "context": "pages/login.html:51:39-59, pages/register/index.html:30:35-55, pages/register/password.html:34:33-53, pages/upstream_oauth2/do_register.html:101:35-55, pages/upstream_oauth2/do_register.html:107:39-59"
     }
   },
   "error": {
@@ -489,7 +489,7 @@
       },
       "username_or_email": "Username or Email",
       "@username_or_email": {
-        "context": "pages/login.html:46:37-69"
+        "context": "pages/login.html:47:39-71"
       }
     },
     "navbar": {