diff --git a/warehouse/locale/messages.pot b/warehouse/locale/messages.pot
index 63d143dbad85..c69f65e4550f 100644
--- a/warehouse/locale/messages.pot
+++ b/warehouse/locale/messages.pot
@@ -432,7 +432,7 @@ msgid "Sponsor"
 msgstr ""
 
 #: warehouse/templates/accounts/login.html:18
-#: warehouse/templates/accounts/login.html:94 warehouse/templates/base.html:43
+#: warehouse/templates/accounts/login.html:88 warehouse/templates/base.html:43
 #: warehouse/templates/base.html:57
 msgid "Log in"
 msgstr ""
@@ -813,16 +813,16 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: warehouse/templates/accounts/login.html:76
-#: warehouse/templates/manage/manage_base.html:170
-msgid "Show password"
+#: warehouse/templates/accounts/login.html:75
+msgid "Your password"
 msgstr ""
 
-#: warehouse/templates/accounts/login.html:79
-msgid "Your password"
+#: warehouse/templates/accounts/login.html:92
+#: warehouse/templates/manage/manage_base.html:170
+msgid "Show password"
 msgstr ""
 
-#: warehouse/templates/accounts/login.html:97
+#: warehouse/templates/accounts/login.html:96
 msgid "Forgot password?"
 msgstr ""
 
diff --git a/warehouse/templates/accounts/login.html b/warehouse/templates/accounts/login.html
index a8d214617cb3..b8f446da60ab 100644
--- a/warehouse/templates/accounts/login.html
+++ b/warehouse/templates/accounts/login.html
@@ -64,17 +64,13 @@ <h1 class="page-title">{% trans title=title %}Log in to {{ title }}{% endtrans %
         </div>
 
         <div data-controller="password" class="form-group">
-          <div class="split-layout">
+          <div>
             <label for="password" class="form-group__label">
               {% trans %}Password{% endtrans %}
               {% if form.password.flags.required %}
               <span class="form-group__required">{% trans %}(required){% endtrans %}</span>
               {% endif %}
             </label>
-            <label for="show-password">
-              <input data-action="change->password#togglePasswords" data-target="password.showPassword"
-                id="show-password" type="checkbox">&nbsp;{% trans %}Show password{% endtrans %}
-            </label>
           </div>
           {{ form.password(placeholder=gettext("Your password"), required="required", class_="form-group__field", autocomplete="current-password", spellcheck="false", data_target="password.password", **{"aria-describedby":"password-errors"}) }}
           <div id="password-errors">
@@ -86,12 +82,15 @@ <h1 class="page-title">{% trans title=title %}Log in to {{ title }}{% endtrans %
             </ul>
             {% endif %}
           </div>
-        </div>
-
-        <div class="form-group">
-          <div class="split-layout split-layout--table">
-            <div>
-              <input type="submit" value="{% trans %}Log in{% endtrans %}" class="button button--primary">
+          <div class="form-group">
+            <div class="split-layout margin-top--large margin-bottom--large">
+              <div>
+                <input type="submit" value="{% trans %}Log in{% endtrans %}" class="button button--primary">
+              </div>
+              <label for="show-password">
+                <input data-action="change->password#togglePasswords" data-target="password.showPassword"
+                  id="show-password" type="checkbox">&nbsp;{% trans %}Show password{% endtrans %}
+              </label>
             </div>
             <span>
               <a href="{{request.route_url('accounts.request-password-reset')}}">{% trans %}Forgot password?{% endtrans %}</a>