diff --git a/src/components/login/login.jsx b/src/components/login/login.jsx
index 116d3fd9a..bd8449c3b 100644
--- a/src/components/login/login.jsx
+++ b/src/components/login/login.jsx
@@ -7,6 +7,7 @@ const Form = require('../forms/form.jsx');
 const Input = require('../forms/input.jsx');
 const Button = require('../forms/button.jsx');
 const Spinner = require('../spinner/spinner.jsx');
+const FlexRow = require('../flex-row/flex-row.jsx');
 
 require('./login.scss');
 
@@ -59,34 +60,35 @@ class Login extends React.Component {
                         name="password"
                         type="password"
                     />
-                    {this.state.waiting ? [
-                        <Button
-                            className="submit-button white"
-                            disabled="disabled"
-                            key="submitButton"
-                            type="submit"
+                    <FlexRow className="submit-row">
+                        {this.state.waiting ? [
+                            <Button
+                                className="submit-button white"
+                                disabled="disabled"
+                                key="submitButton"
+                                type="submit"
+                            >
+                                <Spinner
+                                    className="spinner"
+                                    color="blue"
+                                />
+                            </Button>
+                        ] : [
+                            <Button
+                                className="submit-button white"
+                                key="submitButton"
+                                type="submit"
+                            >
+                                <FormattedMessage id="general.signIn" />
+                            </Button>
+                        ]}
+                        <a
+                            href="/accounts/password_reset/"
+                            key="passwordResetLink"
                         >
-                            <Spinner
-                                className="spinner"
-                                color="blue"
-                            />
-                        </Button>
-                    ] : [
-                        <Button
-                            className="submit-button white"
-                            key="submitButton"
-                            type="submit"
-                        >
-                            <FormattedMessage id="general.signIn" />
-                        </Button>
-                    ]}
-                    <a
-                        className="right"
-                        href="/accounts/password_reset/"
-                        key="passwordResetLink"
-                    >
-                        <FormattedMessage id="login.needHelp" />
-                    </a>
+                            <FormattedMessage id="login.needHelp" />
+                        </a>
+                    </FlexRow>
                     {error}
                 </Form>
             </div>
diff --git a/src/components/login/login.scss b/src/components/login/login.scss
index f6c809e88..7ddd4a317 100644
--- a/src/components/login/login.scss
+++ b/src/components/login/login.scss
@@ -28,22 +28,23 @@
         font-weight: bold;
     }
 
-    .right {
-        float: right;
-    }
-
     .spinner {
         margin: 0 .8rem;
         width: 1rem;
         vertical-align: middle;
     }
+    
+    .submit-row {
+        justify-content: space-between;
+        flex-direction: row; // override 'column' layout at small widths
+    }
 
     .submit-button {
         margin-top: 5px;
     }
 
     a {
-        margin-top: 15px;
+        margin: auto 0;
         color: $ui-white;
 
         &:link,