diff --git a/src/containers/AuthenticationPage/AuthenticationPage.css b/src/containers/AuthenticationPage/AuthenticationPage.css
index 5f535fbe..39e40c40 100644
--- a/src/containers/AuthenticationPage/AuthenticationPage.css
+++ b/src/containers/AuthenticationPage/AuthenticationPage.css
@@ -1,5 +1,13 @@
 @import '../../marketplace.css';
 
+.layoutWrapperMain {
+  min-height: calc(100vh - var(--topbarHeight));
+
+  @media (--viewportMedium) {
+    min-height: calc(100vh - var(--topbarHeightDesktop));
+  }
+}
+
 .root {
   @apply --marketplaceModalRootStyles;
 }
diff --git a/src/containers/AuthenticationPage/AuthenticationPage.js b/src/containers/AuthenticationPage/AuthenticationPage.js
index 0ea25b87..cd97b4ee 100644
--- a/src/containers/AuthenticationPage/AuthenticationPage.js
+++ b/src/containers/AuthenticationPage/AuthenticationPage.js
@@ -20,6 +20,11 @@ import {
   IconEmailSent,
   InlineTextButton,
   IconClose,
+  LayoutSingleColumn,
+  LayoutWrapperTopbar,
+  LayoutWrapperMain,
+  LayoutWrapperFooter,
+  Footer,
 } from '../../components';
 import { LoginForm, SignupForm, TopbarContainer } from '../../containers';
 import { login, authenticationInProgress, signup } from '../../ducks/Auth.duck';
@@ -216,10 +221,19 @@ export const AuthenticationPageComponent = props => {
         name: schemaTitle,
       }}
     >
-      <TopbarContainer className={topbarClasses} />
-      <div className={css.root}>
-        {showEmailVerification ? emailVerificationContent : formContent}
-      </div>
+      <LayoutSingleColumn>
+        <LayoutWrapperTopbar>
+          <TopbarContainer className={topbarClasses} />
+        </LayoutWrapperTopbar>
+        <LayoutWrapperMain className={css.layoutWrapperMain}>
+          <div className={css.root}>
+            {showEmailVerification ? emailVerificationContent : formContent}
+          </div>
+        </LayoutWrapperMain>
+        <LayoutWrapperFooter>
+          <Footer />
+        </LayoutWrapperFooter>
+      </LayoutSingleColumn>
     </Page>
   );
 };
diff --git a/src/containers/AuthenticationPage/__snapshots__/AuthenticationPage.test.js.snap b/src/containers/AuthenticationPage/__snapshots__/AuthenticationPage.test.js.snap
index e8a1eff6..09f1a40f 100644
--- a/src/containers/AuthenticationPage/__snapshots__/AuthenticationPage.test.js.snap
+++ b/src/containers/AuthenticationPage/__snapshots__/AuthenticationPage.test.js.snap
@@ -14,61 +14,82 @@ exports[`AuthenticationPageComponent matches snapshot 1`] = `
   scrollingDisabled={false}
   title="AuthenticationPage.schemaTitleLogin"
 >
-  <withRouter(Connect(TopbarContainerComponent))
-    className=""
-  />
-  <div>
-    <div>
-      <TabNavHorizontal
-        className={null}
-        rootClassName={null}
-        skin="light"
-        tabClassName={null}
-        tabRootClassName={null}
-        tabs={
-          Array [
-            Object {
-              "linkProps": Object {
-                "name": "SignupPage",
-                "to": Object {
-                  "state": Object {
-                    "from": "/protected",
-                  },
-                },
-              },
-              "selected": false,
-              "text": <h1>
-                <FormattedMessage
-                      id="AuthenticationPage.signupLinkText"
-                      values={Object {}}
-                />
-          </h1>,
-            },
-            Object {
-              "linkProps": Object {
-                "name": "LoginPage",
-                "to": Object {
-                  "state": Object {
-                    "from": "/protected",
-                  },
-                },
-              },
-              "selected": true,
-              "text": <h1>
-                <FormattedMessage
-                      id="AuthenticationPage.loginLinkText"
-                      values={Object {}}
-                />
-          </h1>,
-            },
-          ]
-        }
+  <LayoutSingleColumn
+    className={null}
+    rootClassName={null}
+  >
+    <LayoutWrapperTopbar
+      className={null}
+      rootClassName={null}
+    >
+      <withRouter(Connect(TopbarContainerComponent))
+        className=""
       />
-      <ReduxForm
-        inProgress={false}
-        onSubmit={[Function]}
-      />
-    </div>
-  </div>
+    </LayoutWrapperTopbar>
+    <LayoutWrapperMain
+      className={null}
+      rootClassName={null}
+    >
+      <div>
+        <div>
+          <TabNavHorizontal
+            className={null}
+            rootClassName={null}
+            skin="light"
+            tabClassName={null}
+            tabRootClassName={null}
+            tabs={
+              Array [
+                Object {
+                  "linkProps": Object {
+                    "name": "SignupPage",
+                    "to": Object {
+                      "state": Object {
+                        "from": "/protected",
+                      },
+                    },
+                  },
+                  "selected": false,
+                  "text": <h1>
+                    <FormattedMessage
+                          id="AuthenticationPage.signupLinkText"
+                          values={Object {}}
+                    />
+              </h1>,
+                },
+                Object {
+                  "linkProps": Object {
+                    "name": "LoginPage",
+                    "to": Object {
+                      "state": Object {
+                        "from": "/protected",
+                      },
+                    },
+                  },
+                  "selected": true,
+                  "text": <h1>
+                    <FormattedMessage
+                          id="AuthenticationPage.loginLinkText"
+                          values={Object {}}
+                    />
+              </h1>,
+                },
+              ]
+            }
+          />
+          <ReduxForm
+            inProgress={false}
+            onSubmit={[Function]}
+          />
+        </div>
+      </div>
+    </LayoutWrapperMain>
+    <LayoutWrapperFooter
+      className={null}
+      rootClassName={null}
+    >
+      <InjectIntl(Footer) />
+    </LayoutWrapperFooter>
+  </LayoutSingleColumn>
 </Page>
 `;