diff --git a/app/assets/javascripts/discourse/templates/modal/create_account.js.handlebars b/app/assets/javascripts/discourse/templates/modal/create_account.js.handlebars
index aec6b0392cd..fd9fed93348 100644
--- a/app/assets/javascripts/discourse/templates/modal/create_account.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/create_account.js.handlebars
@@ -36,7 +36,7 @@
       </tr>
       <tr>
         <td></td>
-        <td><label>Must be unique, no spaces. People can mention you as @username.</label></td>
+        <td><label>{{i18n user.username.instructions}}</label></td>
       </tr>
 
       {{#if view.passwordRequired}}
@@ -50,7 +50,7 @@
       {{/if}}
 
       <tr class="password-confirmation">
-          <td><label for='new-account-password-confirmation'>Password Again</label></td>
+          <td><label for='new-account-password-confirmation'>{{i18n user.password_confirmation.title}}</label></td>
           <td>
           {{view Ember.TextField valueBinding="view.accountPasswordConfirm" type="password" id="new-account-password-confirmation"}}
           {{view Ember.TextField valueBinding="view.accountChallenge" id="new-account-challenge"}}
diff --git a/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars b/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
index f4373f98b3e..851c3c59f5d 100644
--- a/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
@@ -13,8 +13,8 @@
       {{#linkTo "preferences.username" class="btn pad-left"}}{{i18n user.change_username.action}}{{/linkTo}}
     </div>
     <div class='instructions'>
-      {{{i18n user.username.instructions username="content.username"}}}
-    </div>  
+      {{{i18n user.username.short_instructions username="content.username"}}}
+    </div>
   </div>
 
   <div class="control-group">
@@ -24,7 +24,7 @@
     </div>
     <div class='instructions'>
       {{i18n user.name.instructions}}
-    </div>    
+    </div>
   </div>
 
   <div class="control-group">
@@ -39,7 +39,7 @@
   </div>
 
   <div class="control-group">
-    <label class="control-label">{{i18n user.password.title}}</label>   
+    <label class="control-label">{{i18n user.password.title}}</label>
     <div class="controls">
       <a href="#" {{action changePassword target="controller"}} class='btn'>{{i18n user.change_password}}</a> {{controller.passwordProgress}}
     </div>
@@ -52,32 +52,32 @@
     </div>
     <div class='instructions'>
       {{{i18n user.avatar.instructions}}} {{content.email}}
-    </div>    
-  </div>
-
-  <div class="control-group">  
-    <label class="control-label">{{i18n user.bio}}</label>
-    <div class="controls">      
-      {{view Discourse.PagedownEditor valueBinding="content.bio_raw"}}      
     </div>
   </div>
 
-  <div class="control-group">  
+  <div class="control-group">
+    <label class="control-label">{{i18n user.bio}}</label>
+    <div class="controls">
+      {{view Discourse.PagedownEditor valueBinding="content.bio_raw"}}
+    </div>
+  </div>
+
+  <div class="control-group">
     <label class="control-label">{{i18n user.website}}</label>
     <div class="controls">
       {{view Ember.TextField valueBinding="content.website" classNames="input-xxlarge"}}
     </div>
   </div>
 
-  <div class="control-group">  
-    <label class="control-label">{{i18n user.email_settings}}</label>      
+  <div class="control-group">
+    <label class="control-label">{{i18n user.email_settings}}</label>
     <div class="controls">
       <label>{{view Ember.Checkbox checkedBinding="content.email_digests"}}
       {{i18n user.email_digests.title}}</label>
 
       {{#if content.email_digests}}
         <div class='control-indent'>
-          {{view Discourse.ComboboxView valueAttribute="value" contentBinding="controller.digestFrequencies" valueBinding="content.digest_after_days"}}          
+          {{view Discourse.ComboboxView valueAttribute="value" contentBinding="controller.digestFrequencies" valueBinding="content.digest_after_days"}}
         </div>
       {{/if}}
       <label>{{view Ember.Checkbox checkedBinding="content.email_private_messages"}}
@@ -87,19 +87,19 @@
     </div>
     <div class='instructions'>
       {{i18n user.email.frequency}}
-    </div>     
+    </div>
   </div>
-  
-  <div class="control-group other">  
-    <label class="control-label">{{i18n user.other_settings}}</label>    
+
+  <div class="control-group other">
+    <label class="control-label">{{i18n user.other_settings}}</label>
     <div class="controls">
       <label>{{i18n user.auto_track_topics}}</label>
-      {{view Discourse.ComboboxView valueAttribute="value" contentBinding="controller.autoTrackDurations" valueBinding="content.auto_track_topics_after_msecs"}}          
+      {{view Discourse.ComboboxView valueAttribute="value" contentBinding="controller.autoTrackDurations" valueBinding="content.auto_track_topics_after_msecs"}}
     </div>
-    
+
     <div class="controls">
       <label>{{i18n user.new_topic_duration.label}}</label>
-      {{view Discourse.ComboboxView valueAttribute="value" contentBinding="controller.considerNewTopicOptions" valueBinding="content.new_topic_duration_minutes"}}          
+      {{view Discourse.ComboboxView valueAttribute="value" contentBinding="controller.considerNewTopicOptions" valueBinding="content.new_topic_duration_minutes"}}
     </div>
   </div>
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index a5c1cdcf70b..20a1cab96f9 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -92,7 +92,8 @@ en:
         ok: "Your name looks good."
       username:
         title: "Username"
-        instructions: "People can mention you as @{{username}}."
+        instructions: "Must be unique, no spaces. People can mention you as @username."
+        short_instructions: "People can mention you as @{{username}}."
         available: "Your username is available."
         global_match: "Email matches the registered username."
         global_mismatch: "Already registered. Try {{suggestion}}?"
@@ -102,6 +103,9 @@ en:
         checking: "Checking username availability..."
         enter_email: 'Username found. Enter matching email.'
 
+      password_confirmation:
+        title: "Password Again"
+
       last_posted: "Last Post"
       last_emailed: "Last Emailed"
       last_seen: "Last Seen"
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 2746ed7296d..4d55eddc210 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -95,7 +95,8 @@ fr:
         ok: "Votre nom à l'air sympa !."
       username:
         title: "Pseudo"
-        instructions: "Les gens peuvent vous mentionner avec @{{username}}."
+        instructions: "Doit être unique et ne pas contenir d'espace. Les gens pourrons vous mentionner avec @pseudo."
+        short_instructions: "Les gens peuvent vous mentionner avec @{{username}}."
         available: "Votre pseudo est disponible."
         global_match: "L'adresse email correspond au pseudo enregistré."
         global_mismatch: "Déjà enregistré. Essayez {{suggestion}} ?"
@@ -105,6 +106,9 @@ fr:
         checking: "Vérification de la disponibilité de votre pseudo..."
         enter_email: "Pseudo trouvé. Entrez l'adresse email correspondante."
 
+      password_confirmation:
+        title: "Confirmation"
+
       last_posted: "Dernier message"
       last_emailed: "Dernier mail"
       last_seen: "Dernier vu"