diff --git a/app/pages/signin/index.js b/app/pages/signin/index.js
index d69ae1b4..6e8248fe 100644
--- a/app/pages/signin/index.js
+++ b/app/pages/signin/index.js
@@ -2,16 +2,13 @@ const html = require('choo/html');
 const assets = require('../../../common/assets');
 const title = require('../../templates/title');
 
-// eslint-disable-next-line no-unused-vars
 module.exports = function(state, emit) {
   return html`
-
     <div class="page signInPage">
-      <a href="/" class="goBackButton"> 
-        <img src="${assets.get('back-arrow.svg')}"/> 
+      <a href="/" class="goBackButton">
+        <img src="${assets.get('back-arrow.svg')}"/>
       </a>
       ${title(state)}
-
       <div class="signIn__info flexible">
         ${state.translate('accountBenefitTitle')}
       <ul>
@@ -23,19 +20,15 @@ module.exports = function(state, emit) {
         <li>${state.translate('accountBenefitMore')}</li>
       </ul>
       </div>
-
       <div class="signIn__form flexible">
-
         <img class="signIn__firefoxLogo"
           src="${assets.get('firefox_logo-only.svg')}"
           width=56 height=56
           alt="Firefox logo"/>
-
           <div class="signIn__emailLabel">
             ${state.translate('signInEmailEnter')}
           </div>
           ${state.translate('signInContinueMessage')}
-
           <form
             onsubmit=${submitEmail}
             data-no-csrf>
@@ -43,24 +36,20 @@ module.exports = function(state, emit) {
               type="text"
               class="signIn__emailInput"
               placeholder=${state.translate('emailEntryPlaceholder')}/>
-
             <input
               class='noDisplay'
               id="emailSubmit"
               type="submit"/>
           </form>
-
       </div>
-
       <label class="btn" for="emailSubmit">
         ${state.translate('signInContinueButton')}
       </label>
-
     </div>
   `;
 
   function submitEmail(event) {
     event.preventDefault();
-    //TODO: hook up fxA onboarding
+    emit('login');
   }
 };
diff --git a/app/templates/signupPromo/index.js b/app/templates/signupPromo/index.js
index 376b5ba0..54dde7d8 100644
--- a/app/templates/signupPromo/index.js
+++ b/app/templates/signupPromo/index.js
@@ -1,6 +1,9 @@
 const html = require('choo/html');
 
 module.exports = function(state) {
+  if (state.user.loggedIn) {
+    return null;
+  }
   return html`
   <div class="signupPromo">
     <div class="signupPromo__title">${state.translate('signInPromoText')}</div>