diff --git a/core/client/app/controllers/signup.js b/core/client/app/controllers/signup.js
index f9f81d5964..794222305d 100644
--- a/core/client/app/controllers/signup.js
+++ b/core/client/app/controllers/signup.js
@@ -44,7 +44,7 @@ export default Ember.Controller.extend(ValidationEngine, {
                 }).catch(function (resp) {
                     self.toggleProperty('submitting');
                     if (resp && resp.jqXHR && resp.jqXHR.responseJSON && resp.jqXHR.responseJSON.errors) {
-                        self.set('flowErrors', 'That email address is already in use.');
+                        self.set('flowErrors', resp.jqXHR.responseJSON.errors[0].message);
                     } else {
                         notifications.showAPIError(resp);
                     }
diff --git a/core/client/app/templates/signup.hbs b/core/client/app/templates/signup.hbs
index b6a5e35eb6..49a86ff053 100644
--- a/core/client/app/templates/signup.hbs
+++ b/core/client/app/templates/signup.hbs
@@ -21,7 +21,7 @@
                 {{#gh-form-group errors=model.errors property="email"}}
                     <label for="email-address">Email address</label>
                     <span class="input-icon icon-mail">
-                        {{gh-input type="email" name="email" placeholder="Eg. john@example.com" class="gh-input" enter=(action "signup") autofocus="autofocus" autocorrect="off" value=model.email focusOut=(action "validate" "email")}}
+                        {{gh-input type="email" name="email" placeholder="Eg. john@example.com" class="gh-input" enter=(action "signup") disabled=true autocorrect="off" value=model.email focusOut=(action "validate" "email")}}
                     </span>
                     {{gh-error-message errors=model.errors property="email"}}
                 {{/gh-form-group}}
diff --git a/core/client/app/templates/team/user.hbs b/core/client/app/templates/team/user.hbs
index 420bb0f4f4..2f5d4fab3b 100644
--- a/core/client/app/templates/team/user.hbs
+++ b/core/client/app/templates/team/user.hbs
@@ -1,7 +1,7 @@
 <section class="gh-view">
     <header class="view-header">
         {{#gh-view-title openMobileMenu="openMobileMenu"}}
-            {{link-to "team" "team"}}
+            {{link-to "Team" "team"}}
             <i class="icon-arrow-right"></i> {{user.name}}
         {{/gh-view-title}}
         <section class="view-actions">