diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index d40997720..279fc604f 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -85,10 +85,6 @@ export const fetchSignUp = (formData, redirectUri) => (dispatch) => {
   coralApi('/users', {method: 'POST', body: formData, headers: {'X-Pym-Url': redirectUri}})
     .then(({user}) => {
       dispatch(signUpSuccess(user));
-
-      // setTimeout(() =>{
-      //   dispatch(changeView('SIGNIN'));
-      // }, 3000);
     })
     .catch(error => {
       dispatch(signUpFailure(lang.t(`error.${error.message}`)));
diff --git a/client/coral-sign-in/components/SignUpContent.js b/client/coral-sign-in/components/SignUpContent.js
index 04bd2fd3e..3607b246f 100644
--- a/client/coral-sign-in/components/SignUpContent.js
+++ b/client/coral-sign-in/components/SignUpContent.js
@@ -6,104 +6,148 @@ import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../translations';
 const lang = new I18n(translations);
 
-const SignUpContent = ({handleChange, formData, emailVerificationEnabled, ...props}) => {
-  const beforeSignup = !props.auth.isLoading && !props.auth.successSignUp;
-  const successfulSignup = !props.auth.isLoading && props.auth.successSignUp;
+class SignUpContent extends React.Component {
 
-  return (
-    <div>
-      <div className={styles.header}>
-        <h1>
-          {lang.t('signIn.signUp')}
-        </h1>
-      </div>
+  constructor (props) {
+    super(props);
+    this.successfulSignup = false;
+  }
 
-      { props.auth.error && <Alert>{props.auth.error}</Alert> }
-      { beforeSignup &&
-        <div>
-          <div className={styles.socialConnections}>
-            <Button cStyle="facebook" onClick={props.fetchSignInFacebook} full>
-              {lang.t('signIn.facebookSignUp')}
-            </Button>
-          </div>
-          <div className={styles.separator}>
-            <h1>
-              {lang.t('signIn.or')}
-            </h1>
-          </div>
-          <form onSubmit={props.handleSignUp}>
-            <FormField
-              id="email"
-              type="email"
-              label={lang.t('signIn.email')}
-              value={formData.email}
-              showErrors={props.showErrors}
-              errorMsg={props.errors.email}
-              onChange={handleChange}
-            />
-            <FormField
-              id="displayName"
-              type="text"
-              label={lang.t('signIn.displayName')}
-              value={formData.displayName}
-              showErrors={props.showErrors}
-              errorMsg={props.errors.displayName}
-              onChange={handleChange}
-            />
-            <FormField
-              id="password"
-              type="password"
-              label={lang.t('signIn.password')}
-              value={formData.password}
-              showErrors={props.showErrors}
-              errorMsg={props.errors.password}
-              onChange={handleChange}
-              minLength="8"
-            />
-            { props.errors.password && <span className={styles.hint}> Password must be at least 8 characters. </span> }
-            <FormField
-              id="confirmPassword"
-              type="password"
-              label={lang.t('signIn.confirmPassword')}
-              value={formData.confirmPassword}
-              showErrors={props.showErrors}
-              errorMsg={props.errors.confirmPassword}
-              onChange={handleChange}
-              minLength="8"
-            />
-            <div className={styles.action}>
-              <Button type="submit" cStyle="black" id='coralSignUpButton' className={styles.signInButton} full>
-                {lang.t('signIn.signUp')}
+  static propTypes = {
+    emailVerificationEnabled: PropTypes.bool.isRequired,
+    fetchSignInFacebook: PropTypes.func.isRequired,
+    changeView: PropTypes.func.isRequired,
+    handleSignUp: PropTypes.func.isRequired,
+    showErrors: PropTypes.bool,
+    errors: PropTypes.shape({
+      email: PropTypes.string,
+      displayName: PropTypes.string,
+      password: PropTypes.string,
+      confirmPassword: PropTypes.string,
+    }),
+    formData: PropTypes.shape({
+      email: PropTypes.string,
+      displayName: PropTypes.string,
+      password: PropTypes.string,
+      confirmPassword: PropTypes.string
+    })
+  }
+
+  render () {
+
+    const {
+      handleChange,
+      formData,
+      emailVerificationEnabled,
+      auth,
+      errors,
+      showErrors,
+      changeView,
+      handleSignUp,
+      fetchSignInFacebook} = this.props;
+
+    const beforeSignup = !auth.isLoading && !auth.successSignUp;
+    const successfulSignup = !auth.isLoading && auth.successSignUp;
+
+    // the first time we render a successfulSignup, trigger a timer
+    if ((this.successfulSignup ^ successfulSignup) && !emailVerificationEnabled) {
+      setTimeout(() => {
+        changeView('SIGNIN');
+      }, 1000);
+      this.successfulSignup = true;
+    }
+
+    return (
+      <div>
+        <div className={styles.header}>
+          <h1>
+            {lang.t('signIn.signUp')}
+          </h1>
+        </div>
+
+        { auth.error && <Alert>{auth.error}</Alert> }
+        { beforeSignup &&
+          <div>
+            <div className={styles.socialConnections}>
+              <Button cStyle="facebook" onClick={fetchSignInFacebook} full>
+                {lang.t('signIn.facebookSignUp')}
               </Button>
-              { props.auth.isLoading && <Spinner /> }
             </div>
-          </form>
+            <div className={styles.separator}>
+              <h1>
+                {lang.t('signIn.or')}
+              </h1>
+            </div>
+            <form onSubmit={handleSignUp}>
+              <FormField
+                id="email"
+                type="email"
+                label={lang.t('signIn.email')}
+                value={formData.email}
+                showErrors={showErrors}
+                errorMsg={errors.email}
+                onChange={handleChange}
+              />
+              <FormField
+                id="displayName"
+                type="text"
+                label={lang.t('signIn.displayName')}
+                value={formData.displayName}
+                showErrors={showErrors}
+                errorMsg={errors.displayName}
+                onChange={handleChange}
+              />
+              <FormField
+                id="password"
+                type="password"
+                label={lang.t('signIn.password')}
+                value={formData.password}
+                showErrors={showErrors}
+                errorMsg={errors.password}
+                onChange={handleChange}
+                minLength="8"
+              />
+              { errors.password && <span className={styles.hint}> Password must be at least 8 characters. </span> }
+              <FormField
+                id="confirmPassword"
+                type="password"
+                label={lang.t('signIn.confirmPassword')}
+                value={formData.confirmPassword}
+                showErrors={showErrors}
+                errorMsg={errors.confirmPassword}
+                onChange={handleChange}
+                minLength="8"
+              />
+              <div className={styles.action}>
+                <Button type="submit" cStyle="black" id='coralSignUpButton' className={styles.signInButton} full>
+                  {lang.t('signIn.signUp')}
+                </Button>
+                { auth.isLoading && <Spinner /> }
+              </div>
+            </form>
+          </div>
+        }
+        {
+          successfulSignup &&
+          <div>
+            <Success />
+            {
+              emailVerificationEnabled &&
+              <p>{lang.t('signIn.verifyEmail')}<br /><br />{lang.t('signIn.verifyEmail2')}</p>
+            }
+          </div>
+        }
+        <div className={styles.footer}>
+          <span>
+            {lang.t('signIn.alreadyHaveAnAccount')}
+            <a id="coralLogInButton" onClick={() => changeView('SIGNIN')}>
+              {lang.t('signIn.signIn')}
+            </a>
+          </span>
         </div>
-      }
-      {
-        successfulSignup &&
-        <div>
-          <Success />
-          {
-            emailVerificationEnabled &&
-            <p>{lang.t('signIn.verifyEmail')}<br /><br />{lang.t('signIn.verifyEmail2')}</p>
-          }
-        </div>
-      }
-      <div className={styles.footer}>
-        <span>
-          {lang.t('signIn.alreadyHaveAnAccount')}
-          <a id="coralLogInButton" onClick={() => props.changeView('SIGNIN')}>
-            {lang.t('signIn.signIn')}
-          </a>
-        </span>
       </div>
-    </div>
-  );
-};
-
-SignUpContent.propTypes = {
-  emailVerificationEnabled: PropTypes.bool.isRequired
-};
+    );
+  }
+}
 
 export default SignUpContent;