diff --git a/js/forum/src/components/ChangeEmailModal.js b/js/forum/src/components/ChangeEmailModal.js
index 8c23890e9..f69ce20de 100644
--- a/js/forum/src/components/ChangeEmailModal.js
+++ b/js/forum/src/components/ChangeEmailModal.js
@@ -38,7 +38,7 @@ export default class ChangeEmailModal extends Modal {
       return (
         <div className="Modal-body">
           <div class="Form Form--centered">
-            <p class="helpText">{m.trust(app.trans('core.confirmation_email_sent', {email: this.email()}))}</p>
+            <p class="helpText">{m.trust(app.trans('core.confirmation_email_sent', {email: <strong>{this.email()}</strong>}))}</p>
             <div class="Form-group">
               <a href={'http://' + emailProviderName} className="Button Button--primary Button--block">
                 {app.trans('core.go_to', {location: emailProviderName})}
diff --git a/js/forum/src/components/SignUpModal.js b/js/forum/src/components/SignUpModal.js
index db0d46b11..500988baa 100644
--- a/js/forum/src/components/SignUpModal.js
+++ b/js/forum/src/components/SignUpModal.js
@@ -69,7 +69,7 @@ export default class SignUpModal extends Modal {
         <div className="Form-group">
           <input className="FormControl" name="username" placeholder={app.trans('core.username')}
             value={this.username()}
-            onchange={m.withAttr('value', this.email)}
+            onchange={m.withAttr('value', this.username)}
             disabled={this.loading} />
         </div>
 
@@ -108,25 +108,26 @@ export default class SignUpModal extends Modal {
 
       body.push(
         <div className="SignUpModal-welcome" style={{background: user.color()}} config={fadeIn}>
-          <div className="darkenBackground"/>
-          <div className="container">
-            {avatar(user)}
-            <h3>{app.trans('core.welcome_user', {user})}</h3>
+          <div className="darkenBackground">
+            <div className="container">
+              {avatar(user)}
+              <h3>{app.trans('core.welcome_user', {user})}</h3>
 
-            {user.isConfirmed() ? [
-              <p>{app.trans('core.confirmation_email_sent', {email: user.email()})}</p>,
-              <p>
-                <a href={`http://${emailProviderName}`} className="Button Button--primary">
-                  {app.trans('core.go_to', {location: emailProviderName})}
-                </a>
-              </p>
-            ] : (
-              <p>
-                <button className="Button Button--primary" onclick={this.hide.bind(this)}>
-                  {app.trans('core.dismiss')}
-                </button>
-              </p>
-            )}
+              {!user.isConfirmed() ? [
+                <p>{app.trans('core.confirmation_email_sent', {email: <strong>{user.email()}</strong>})}</p>,
+                <p>
+                  <a href={`http://${emailProviderName}`} className="Button Button--primary">
+                    {app.trans('core.go_to', {location: emailProviderName})}
+                  </a>
+                </p>
+              ] : (
+                <p>
+                  <button className="Button Button--primary" onclick={this.hide.bind(this)}>
+                    {app.trans('core.dismiss')}
+                  </button>
+                </p>
+              )}
+            </div>
           </div>
         </div>
       );
diff --git a/less/forum/SignUpModal.less b/less/forum/SignUpModal.less
index e9eb6c5e8..d30b57b28 100644
--- a/less/forum/SignUpModal.less
+++ b/less/forum/SignUpModal.less
@@ -1,44 +1,48 @@
-.signup-welcome {
+.SignUpModal-welcome {
   position: absolute;
   top: 0;
   left: 0;
   right: 0;
   bottom: 0;
   border-radius: @border-radius;
-  padding: 50px 30px;
   text-align: center;
   color: #fff;
   font-size: 14px;
 
   .light-contents();
 
-  & .avatar {
+  .Avatar {
     .Avatar--size(96px);
     border: 4px solid @body-bg;
     .box-shadow(0 2px 6px @shadow-color);
   }
-  & h3, & p {
+  h3, p {
     margin-bottom: 25px;
   }
-  & .btn-default {
+  .Button {
     font-size: 15px;
     height: 50px;
     padding: 15px 20px;
   }
-  & .container {
+  .darkenBackground {
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+  }
+  .container {
     width: auto !important;
-    padding: 0 !important;
+    padding: 50px 30px !important;
     position: relative;
   }
 }
-.signup-modal-success {
-  & .close {
-    color: #fff;
-  }
+.SignUpModal--success .Modal-close .Button {
+  color: #fff;
 }
 
 @media @phone {
-  .signup-welcome {
+  .SignUpModal-welcome .container {
     padding-top: 56px + 60px;
   }
 }
diff --git a/locale/en.yml b/locale/en.yml
index 43939a938..77ef14362 100644
--- a/locale/en.yml
+++ b/locale/en.yml
@@ -17,7 +17,7 @@ core:
   confirm_discard_discussion: You have not posted your discussion. Do you wish to discard it?
   confirm_discard_edit: You have not saved your changes. Do you wish to discard them?
   confirm_discard_reply: You have not posted your reply. Do you wish to discard it?
-  confirmation_email_sent: "We've sent a confirmation email to <strong>{email}</strong>. If it doesn't arrive soon, check your spam folder."
+  confirmation_email_sent: "We've sent a confirmation email to {email}. If it doesn't arrive soon, check your spam folder."
   controls: Controls
   delete: Delete
   delete_account: Delete Account
@@ -35,7 +35,7 @@ core:
   edit: Edit
   editing_post: "Post #{number} in {discussion}"
   email: Email
-  email_confirmation_required: "You need to confirm your email before you can log in. We've sent a confirmation email to <strong>{email}</strong>. If it doesn't arrive soon, check your spam folder."
+  email_confirmation_required: "You need to confirm your email before you can log in. We've sent a confirmation email to {email}. If it doesn't arrive soon, check your spam folder."
   exit_full_screen: Exit Full Screen
   forgot_password: Forgot Password
   forgot_password_help: Enter your email address and we will send you a link to reset your password.