diff --git a/common/app/components/Nav/Nav.jsx b/common/app/components/Nav/Nav.jsx
index d902c72b45..646c2f0015 100644
--- a/common/app/components/Nav/Nav.jsx
+++ b/common/app/components/Nav/Nav.jsx
@@ -191,10 +191,10 @@ export default class extends React.Component {
       return (
         <NavItem
           eventKey={ 2 }
-          href='/signin'
-          key='signin'
+          href='/signup'
+          key='signup'
           >
-          Sign In
+          Sign Up
         </NavItem>
       );
     }
diff --git a/common/app/routes/challenges/redux/completion-saga.js b/common/app/routes/challenges/redux/completion-saga.js
index c12f820787..fdf3bc6861 100644
--- a/common/app/routes/challenges/redux/completion-saga.js
+++ b/common/app/routes/challenges/redux/completion-saga.js
@@ -42,7 +42,7 @@ function submitModern(type, state) {
     if (type === types.checkChallenge) {
       return Observable.of(
         makeToast({
-          message: `${randomCompliment()} Go to next challenge.`,
+          message: `${randomCompliment()} Go to your next challenge.`,
           action: 'Submit',
           actionCreator: 'submitChallenge',
           timeout: 10000
@@ -65,7 +65,9 @@ function submitModern(type, state) {
       );
     }
   }
-  return Observable.just(makeToast({ message: 'Not quite there, yet.' }));
+  return Observable.just(
+    makeToast({ message: 'Keep trying.' })
+  );
 }
 
 function submitProject(type, state, { solution, githubLink }) {
diff --git a/common/app/routes/challenges/redux/next-challenge-saga.js b/common/app/routes/challenges/redux/next-challenge-saga.js
index 5352149ae3..c484ed9d84 100644
--- a/common/app/routes/challenges/redux/next-challenge-saga.js
+++ b/common/app/routes/challenges/redux/next-challenge-saga.js
@@ -64,7 +64,7 @@ export default function nextChallengeSaga(actions$, getState) {
         return Observable.of(
           updateCurrentChallenge(nextChallenge),
           resetUi(),
-          makeToast({ message: 'Your next challenge arrived.' }),
+          makeToast({ message: 'Your next challenge has arrived.' }),
           push(`/challenges/${nextChallenge.block}/${nextChallenge.dashedName}`)
         );
       } catch (err) {
diff --git a/common/app/toasts/redux/actions.js b/common/app/toasts/redux/actions.js
index ec13f62797..667a4f7e26 100644
--- a/common/app/toasts/redux/actions.js
+++ b/common/app/toasts/redux/actions.js
@@ -9,7 +9,7 @@ export const makeToast = createAction(
     // assign current value of key to new toast
     // and then increment key value
     key: key++,
-    dismissAfter: timeout || 2000,
+    dismissAfter: timeout || 6000,
     position: rest.position === 'left' ? 'left' : 'right'
   })
 );
diff --git a/server/views/account/email-signup.jade b/server/views/account/email-signup.jade
index e8a2ce9b23..03b8614495 100644
--- a/server/views/account/email-signup.jade
+++ b/server/views/account/email-signup.jade
@@ -15,3 +15,7 @@ block content
                   button.btn.btn-lg.btn-primary.btn-block(type='submit')
                     span.ion-person-add
                     | Signup
+    .row
+        .col-sm-6.col-sm-offset-3
+            p.text-center
+                a(href="/signin") Click here if you already have an account and want to sign in.
diff --git a/server/views/home.jade b/server/views/home.jade
index 894d9dbde4..1b723a0e2c 100644
--- a/server/views/home.jade
+++ b/server/views/home.jade
@@ -25,7 +25,7 @@ block content
         .big-break
         .row
             .col-xs-12.col-sm-8.col-sm-offset-2
-                a.btn.btn-cta.signup-btn.btn-block(href="/signin") Start coding (it's free)
+                a.btn.btn-cta.signup-btn.btn-block(href="/signup") Start coding (it's free)
         .spacer
         h2 As featured in:
         img.img-center.img-responsive(src='https://s3.amazonaws.com/freecodecamp/as-seen-on.png')
@@ -111,6 +111,6 @@ block content
         .big-break
         .row
             .col-xs-12.col-sm-8.col-sm-offset-2
-                a.btn.btn-cta.signup-btn.btn-block(href="/signin") Start coding (it's free)
+                a.btn.btn-cta.signup-btn.btn-block(href="/signup") Start coding (it's free)
         script.
             challengeName = 'Home'
diff --git a/server/views/partials/navbar.jade b/server/views/partials/navbar.jade
index 4c215dbce6..4b62bd0c79 100644
--- a/server/views/partials/navbar.jade
+++ b/server/views/partials/navbar.jade
@@ -21,7 +21,7 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height
                 a(href='/shop') Shop
             if !user
                 li
-                    a(href='/signin') Sign in
+                    a(href='/signup') Sign Up
             else
                 li.brownie-points-nav
                     a(href='/settings') [&thinsp;#{user.points}&thinsp;]