diff --git a/app/assets/javascripts/admin/templates/customize.js.handlebars b/app/assets/javascripts/admin/templates/customize.js.handlebars
index 823cf8384a..8931896056 100644
--- a/app/assets/javascripts/admin/templates/customize.js.handlebars
+++ b/app/assets/javascripts/admin/templates/customize.js.handlebars
@@ -24,7 +24,7 @@
   </div>
 
   {{#with content.selectedItem}}
-    {{view Ember.TextField class="style-name" valueBinding="name"}}
+    {{textField class="style-name" value=name}}
     {{#if view.headerActive}}
       {{view Discourse.AceEditorView contentBinding="header" mode="html"}}
     {{/if}}
diff --git a/app/assets/javascripts/admin/templates/site_content_edit.js.handlebars b/app/assets/javascripts/admin/templates/site_content_edit.js.handlebars
index 9955fa0984..fa7499b9f4 100644
--- a/app/assets/javascripts/admin/templates/site_content_edit.js.handlebars
+++ b/app/assets/javascripts/admin/templates/site_content_edit.js.handlebars
@@ -7,7 +7,7 @@
   {{/if}}
 
   {{#if plainText}}
-    {{view Ember.TextArea valueBinding="content.content" class="plain"}}
+    {{textarea value=content.content class="plain"}}
   {{/if}}
 
   {{#if html}}
diff --git a/app/assets/javascripts/admin/templates/site_settings/setting_string.js.handlebars b/app/assets/javascripts/admin/templates/site_settings/setting_string.js.handlebars
index 34a7fcaa3c..935875be57 100644
--- a/app/assets/javascripts/admin/templates/site_settings/setting_string.js.handlebars
+++ b/app/assets/javascripts/admin/templates/site_settings/setting_string.js.handlebars
@@ -3,7 +3,7 @@
      <h3>{{unbound setting}}</h3>
   </div>
   <div class="span11">
-    {{view Ember.TextField valueBinding="value" classNames="input-xxlarge"}}
+    {{textField value=value classNames="input-xxlarge"}}
     <div class='desc'>{{unbound description}}</div>
   </div>
   {{#if dirty}}
diff --git a/app/assets/javascripts/discourse/templates/flag.js.handlebars b/app/assets/javascripts/discourse/templates/flag.js.handlebars
index 115bbe5945..d25569d47b 100644
--- a/app/assets/javascripts/discourse/templates/flag.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/flag.js.handlebars
@@ -1,4 +1,4 @@
-  <div class="modal-body flag-modal">    
+  <div class="modal-body flag-modal">
     {{#if view.post.flagsAvailable}}
       <form>
         {{#each view.boundFlags}}
@@ -8,7 +8,7 @@
               {{#if is_custom_flag}}
                 {{#unless selected}}
                   <div class='description'>{{{description}}}</div>
-                {{/unless}}    
+                {{/unless}}
               {{else}}
                 {{#if description}}
                   <div class='description'>{{{description}}}</div>
@@ -16,8 +16,8 @@
               {{/if}}
             </label>
             {{#if is_custom_flag}}
-                {{#if selected}} 
-                  {{view Ember.TextArea name="message" class="flag-message" placeholderBinding="customPlaceholder" valueBinding="message"}}
+                {{#if selected}}
+                  {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}}
                   <div {{bindAttr class="customMessageLengthClasses"}}>{{customMessageLength}}</div>
                 {{/if}}
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/login.js.handlebars b/app/assets/javascripts/discourse/templates/modal/login.js.handlebars
index 98522e3ec8..8cc85f7e67 100644
--- a/app/assets/javascripts/discourse/templates/modal/login.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/login.js.handlebars
@@ -37,7 +37,7 @@
           <label for='login-account-password'>{{i18n login.password}}&nbsp;</label>
       </td>
       <td>
-          {{view Ember.TextField valueBinding="view.loginPassword" type="password" id="login-account-password"}} &nbsp;
+          {{textField value=view.loginPassword type="password" id="login-account-password"}} &nbsp;
           <a id="forgot-password-link" {{action forgotPassword target="view"}}>{{i18n forgot_password.action}}</a>
       </td>
       </tr>
diff --git a/app/assets/javascripts/discourse/templates/search.js.handlebars b/app/assets/javascripts/discourse/templates/search.js.handlebars
index 14ee9354a5..73dbefa3c7 100644
--- a/app/assets/javascripts/discourse/templates/search.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/search.js.handlebars
@@ -1,4 +1,4 @@
-{{view Ember.TextField valueBinding="view.term" placeholderBinding="view.searchPlaceholder"}}
+{{textField value=view.term placeholderBinding="view.searchPlaceholder"}}
 {{#with view}}
   {{#unless loading}}
     {{#unless noResults}}
@@ -15,12 +15,12 @@
             {{/if}}
           </li>
           {{view Discourse.SearchResultsTypeView typeBinding="type" contentBinding="results"}}
-        </ul>    
+        </ul>
       {{/each}}
     {{else}}
       <div class='no-results'>
         {{i18n search.no_results}}
-      </div>  
+      </div>
     {{/unless}}
   {{else}}
   <div class='searching'><i class='icon-spinner icon-spin'></i></div>
diff --git a/app/assets/javascripts/discourse/templates/user/email.js.handlebars b/app/assets/javascripts/discourse/templates/user/email.js.handlebars
index a7911b9f5f..791fe6d29d 100644
--- a/app/assets/javascripts/discourse/templates/user/email.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/user/email.js.handlebars
@@ -24,7 +24,7 @@
     <div class="control-group">
       <label class="control-label">{{i18n user.email.title}}</label>
       <div class="controls">
-        {{view Ember.TextField valueBinding="controller.newEmail" elementId="change_email" classNames="input-xxlarge"}}
+        {{textField value=newEmail elementId="change_email" classNames="input-xxlarge"}}
       </div>
       <div class='instructions'>
         {{#if controller.taken}}
@@ -32,7 +32,7 @@
         {{else}}
           {{i18n user.email.instructions}}
         {{/if}}
-        
+
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars b/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
index cfdb90b548..01c73f7ddf 100644
--- a/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
@@ -14,7 +14,7 @@
   <div class="control-group">
     <label class="control-label">{{i18n user.name.title}}</label>
     <div class="controls">
-      {{view Ember.TextField valueBinding="content.name" classNames="input-xxlarge"}}
+      {{textField value=name classNames="input-xxlarge"}}
     </div>
     <div class='instructions'>
       {{i18n user.name.instructions}}
@@ -59,7 +59,7 @@
   <div class="control-group">
     <label class="control-label">{{i18n user.website}}</label>
     <div class="controls">
-      {{view Ember.TextField valueBinding="content.website" classNames="input-xxlarge"}}
+      {{textField value=website classNames="input-xxlarge"}}
     </div>
   </div>
 
diff --git a/app/assets/javascripts/discourse/templates/user/username.js.handlebars b/app/assets/javascripts/discourse/templates/user/username.js.handlebars
index 7b4676102f..ac1ec8a884 100644
--- a/app/assets/javascripts/discourse/templates/user/username.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/user/username.js.handlebars
@@ -17,10 +17,10 @@
   <div class="control-group">
     <label class="control-label">{{i18n user.username.title}}</label>
     <div class="controls">
-      {{view Ember.TextField valueBinding="controller.newUsername" elementId="change_username" classNames="input-xxlarge" maxlength="15"}}
+      {{textField value=newUsername id="change_username" classNames="input-xxlarge" maxlength="15"}}
     </div>
     <div class='instructions'>
-      {{#if controller.taken}}
+      {{#if taken}}
         {{i18n user.change_username.taken}}
       {{/if}}
       <span>{{ errorMessage }}</span>
@@ -29,7 +29,7 @@
 
   <div class="control-group">
     <div class="controls">
-        <button {{action changeUsername target="controller"}} {{bindAttr disabled="controller.saveDisabled"}} class="btn btn-primary">{{controller.saveButtonText}}</button>
+        <button {{action changeUsername}} {{bindAttr disabled="saveDisabled"}} class="btn btn-primary">{{saveButtonText}}</button>
         {{#if saved}}{{i18n saved}}{{/if}}
     </div>
   </div>