diff --git a/frontend/components/AuthenticationFormWrapper/AuthenticationFormWrapper.jsx b/frontend/components/AuthenticationFormWrapper/AuthenticationFormWrapper.jsx
index f5c6a36d11..f91be50f20 100644
--- a/frontend/components/AuthenticationFormWrapper/AuthenticationFormWrapper.jsx
+++ b/frontend/components/AuthenticationFormWrapper/AuthenticationFormWrapper.jsx
@@ -1,5 +1,7 @@
 import React, { Component, PropTypes } from 'react';
 
+const baseClass = 'auth-form-wrapper';
+
 class AuthenticationFormWrapper extends Component {
   static propTypes = {
     children: PropTypes.node,
@@ -9,8 +11,8 @@ class AuthenticationFormWrapper extends Component {
     const { children } = this.props;
 
     return (
-      <div className="auth-form-wrapper">
-        <img alt="Kolide text logo" src="/assets/images/kolide-logo-text.svg" />
+      <div className={baseClass}>
+        <img alt="Kolide text logo" src="/assets/images/kolide-logo-text.svg" className={`${baseClass}__logo`} />
         {children}
       </div>
     );
diff --git a/frontend/components/AuthenticationFormWrapper/_styles.scss b/frontend/components/AuthenticationFormWrapper/_styles.scss
index 919a2707dc..e6ad7de1e2 100644
--- a/frontend/components/AuthenticationFormWrapper/_styles.scss
+++ b/frontend/components/AuthenticationFormWrapper/_styles.scss
@@ -1,6 +1,11 @@
 .auth-form-wrapper {
   @include display(flex);
   @include flex-direction(column);
-  @include justify-content(center);
+  @include justify-content(flex-start);
   @include flex-grow(1);
+  padding: $base 0;
+
+  @include breakpoint(desktop) {
+    @include justify-content(center);
+  }
 }
diff --git a/frontend/components/LoginRoutes/_styles.scss b/frontend/components/LoginRoutes/_styles.scss
index 547a2872f9..9a5f367a77 100644
--- a/frontend/components/LoginRoutes/_styles.scss
+++ b/frontend/components/LoginRoutes/_styles.scss
@@ -4,5 +4,5 @@
   @include flex-direction(column);
   @include justify-content(center);
   position: relative;
-  height: calc(100vh - #{$footer-height});
+  min-height: calc(100vh - #{$footer-height});
 }
diff --git a/frontend/pages/ConfirmInvitePage/_styles.scss b/frontend/pages/ConfirmInvitePage/_styles.scss
index e44e304295..8dc3719c25 100644
--- a/frontend/pages/ConfirmInvitePage/_styles.scss
+++ b/frontend/pages/ConfirmInvitePage/_styles.scss
@@ -25,6 +25,7 @@
     height: 459px;
     padding: 35px;
     width: 500px;
+    margin-bottom: 110px;
   }
 
   &__form {