diff --git a/src/components/join-flow/join-flow-step.jsx b/src/components/join-flow/join-flow-step.jsx
index 27ff6afa8..d26e35d03 100644
--- a/src/components/join-flow/join-flow-step.jsx
+++ b/src/components/join-flow/join-flow-step.jsx
@@ -60,15 +60,17 @@ const JoinFlowStep = ({
                     {children}
                 </ModalInnerContent>
             </div>
-            {footerContent && (
-                <div className="join-flow-footer-message">
-                    {footerContent}
-                </div>
-            )}
-            <NextStepButton
-                content={nextButton}
-                waiting={waiting}
-            />
+            <div>
+                {footerContent && (
+                    <div className="join-flow-footer-message">
+                        {footerContent}
+                    </div>
+                )}
+                <NextStepButton
+                    content={nextButton}
+                    waiting={waiting}
+                />
+            </div>
         </div>
     </form>
 );
diff --git a/src/components/join-flow/join-flow-step.scss b/src/components/join-flow/join-flow-step.scss
index 1b13cbec6..5c27e4253 100644
--- a/src/components/join-flow/join-flow-step.scss
+++ b/src/components/join-flow/join-flow-step.scss
@@ -50,7 +50,7 @@
 
 .join-flow-footer-message {
     width: 100%;
-    padding: 1.125rem 1.5rem 1.125rem;
+    padding: 0.875rem 1.5rem;
     background-color: $ui-blue-25percent;
     font-size: .75rem;
     font-weight: 600;
diff --git a/src/components/join-flow/join-flow-steps.scss b/src/components/join-flow/join-flow-steps.scss
index 59075f9f5..7ca7f800b 100644
--- a/src/components/join-flow/join-flow-steps.scss
+++ b/src/components/join-flow/join-flow-steps.scss
@@ -126,7 +126,9 @@
 }
 
 .join-flow-inner-email-step {
-    padding-top: 3rem;
+    padding-top: 1.25rem;
+    padding-bottom: 0;
+    min-height: 16.625rem;
 }
 
 .join-flow-inner-welcome-step {
@@ -203,7 +205,7 @@
 
 .join-flow-email-checkbox-row {
     font-size: .75rem;
-    margin: .25rem .125rem;
+    margin: 1.5rem .125rem .25rem;
 }
 
 a.join-flow-link:link, a.join-flow-link:visited, a.join-flow-link:active {
diff --git a/src/l10n.json b/src/l10n.json
index dbe3875ff..daaee1082 100644
--- a/src/l10n.json
+++ b/src/l10n.json
@@ -169,6 +169,7 @@
     "registration.genderOptionAnother": "Another gender:",
     "registration.genderOptionPreferNotToSay": "Prefer not to say",
     "registration.emailStepTitle": "What's your email?",
+    "registration.emailStepInfo": "NEED EMAIL STEP HERE",
     "registration.goToClass": "Go to Class",
     "registration.invitedBy": "invited by",
     "registration.lastStepTitle": "Thank you for requesting a Scratch Teacher Account",