diff --git a/app/assets/javascripts/discourse/mixins/username-validation.js.es6 b/app/assets/javascripts/discourse/mixins/username-validation.js.es6
index 515d32c3131..b67fa857acc 100644
--- a/app/assets/javascripts/discourse/mixins/username-validation.js.es6
+++ b/app/assets/javascripts/discourse/mixins/username-validation.js.es6
@@ -25,7 +25,7 @@ export default Ember.Mixin.create({
     this.set('uniqueUsernameValidation', null);
 
 
-    if (accountUsername === this.get('prefilledUsername')) {
+    if (accountUsername && accountUsername === this.get('prefilledUsername')) {
       return InputValidation.create({
         ok: true,
         reason: I18n.t('user.username.prefilled')
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index c32fe8e3c1e..9efde75e557 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -11,14 +11,14 @@
           <form>
           <table>
 
-          <tr class="input">
+          <tr class="input create-account-email">
                 <td class="label"><label for='new-account-email'>{{i18n 'user.email.title'}}</label></td>
                 <td>
                 {{input type="email" value=accountEmail id="new-account-email" disabled=emailValidated name="email" autofocus="autofocus"}}
                 &nbsp;{{input-tip validation=emailValidation}}
                 </td>
           </tr>
-          <tr class="instructions">
+          <tr class="instructions create-account-email">
             <td></td>
             <td><label>{{i18n 'user.email.instructions'}}</label></td>
           </tr>