diff --git a/app/assets/javascripts/admin/controllers/admin_github_commits_controller.js b/app/assets/javascripts/admin/controllers/admin_github_commits_controller.js
index 0a6bd38ead1..5e8a7f57c1c 100644
--- a/app/assets/javascripts/admin/controllers/admin_github_commits_controller.js
+++ b/app/assets/javascripts/admin/controllers/admin_github_commits_controller.js
@@ -10,4 +10,4 @@ Discourse.AdminGithubCommitsController = Ember.ArrayController.extend({
   goToGithub: function() {
     window.open('https://github.com/discourse/discourse');
   }
-});
\ No newline at end of file
+});
diff --git a/app/assets/javascripts/admin/controllers/admin_logs_screened_ip_addresses_controller.js b/app/assets/javascripts/admin/controllers/admin_logs_screened_ip_addresses_controller.js
index bbf06d69921..1e39d95a306 100644
--- a/app/assets/javascripts/admin/controllers/admin_logs_screened_ip_addresses_controller.js
+++ b/app/assets/javascripts/admin/controllers/admin_logs_screened_ip_addresses_controller.js
@@ -94,4 +94,4 @@ Discourse.AdminLogsScreenedIpAddressController = Ember.ObjectController.extend({
       });
     }
   }
-});
\ No newline at end of file
+});
diff --git a/app/assets/javascripts/admin/controllers/admin_reports_controller.js b/app/assets/javascripts/admin/controllers/admin_reports_controller.js
index 35fb54b7415..80252b49ec9 100644
--- a/app/assets/javascripts/admin/controllers/admin_reports_controller.js
+++ b/app/assets/javascripts/admin/controllers/admin_reports_controller.js
@@ -16,4 +16,4 @@ Discourse.AdminReportsController = Ember.ObjectController.extend({
     }
   }
 
-});
\ No newline at end of file
+});
diff --git a/app/assets/javascripts/admin/controllers/admin_site_content_edit_controller.js b/app/assets/javascripts/admin/controllers/admin_site_content_edit_controller.js
index 68e5b6d3afa..185ea0818a2 100644
--- a/app/assets/javascripts/admin/controllers/admin_site_content_edit_controller.js
+++ b/app/assets/javascripts/admin/controllers/admin_site_content_edit_controller.js
@@ -25,4 +25,4 @@ Discourse.AdminSiteContentEditController = Discourse.Controller.extend({
   }
 });
 
-Discourse.AdminSiteContentsController = Ember.ArrayController.extend({});
\ No newline at end of file
+Discourse.AdminSiteContentsController = Ember.ArrayController.extend({});
diff --git a/app/assets/javascripts/admin/helpers/report_helpers.js b/app/assets/javascripts/admin/helpers/report_helpers.js
index 270adc2c11f..5d0ee1ac455 100644
--- a/app/assets/javascripts/admin/helpers/report_helpers.js
+++ b/app/assets/javascripts/admin/helpers/report_helpers.js
@@ -14,4 +14,4 @@ Handlebars.registerHelper('valueAtTrustLevel', function(property, trustLevel) {
       return 0;
     }
   }
-});
\ No newline at end of file
+});
diff --git a/app/assets/javascripts/admin/routes/admin_customize_route.js b/app/assets/javascripts/admin/routes/admin_customize_route.js
index 701a03fe58d..bb07dd524ce 100644
--- a/app/assets/javascripts/admin/routes/admin_customize_route.js
+++ b/app/assets/javascripts/admin/routes/admin_customize_route.js
@@ -10,4 +10,4 @@ Discourse.AdminCustomizeIndexRoute = Discourse.Route.extend({
   redirect: function() {
     this.transitionTo('adminCustomize.colors');
   }
-});
\ No newline at end of file
+});
diff --git a/app/assets/javascripts/admin/routes/admin_logs_routes.js b/app/assets/javascripts/admin/routes/admin_logs_routes.js
index 0ac57941d05..2a7dc72300c 100644
--- a/app/assets/javascripts/admin/routes/admin_logs_routes.js
+++ b/app/assets/javascripts/admin/routes/admin_logs_routes.js
@@ -105,4 +105,4 @@ Discourse.AdminLogsScreenedUrlsRoute = Discourse.Route.extend({
   setupController: function() {
     return this.controllerFor('adminLogsScreenedUrls').show();
   }
-});
\ No newline at end of file
+});
diff --git a/app/assets/javascripts/admin/routes/admin_reports_route.js b/app/assets/javascripts/admin/routes/admin_reports_route.js
index 2e9ab9d7cf4..cdc06720ecd 100644
--- a/app/assets/javascripts/admin/routes/admin_reports_route.js
+++ b/app/assets/javascripts/admin/routes/admin_reports_route.js
@@ -10,4 +10,4 @@ Discourse.AdminReportsRoute = Discourse.Route.extend({
   model: function(params) {
     return Discourse.Report.find(params.type);
   }
-});
\ No newline at end of file
+});
diff --git a/app/assets/javascripts/admin/templates/customize_colors.js.handlebars b/app/assets/javascripts/admin/templates/customize_colors.js.handlebars
index 006dde6fc56..0b9c6e13838 100644
--- a/app/assets/javascripts/admin/templates/customize_colors.js.handlebars
+++ b/app/assets/javascripts/admin/templates/customize_colors.js.handlebars
@@ -14,7 +14,7 @@
   <div class="current-style color-scheme">
     <div class="admin-container">
       {{#with selectedItem}}
-        <h1>{{textField class="style-name" value=name}}</h1>
+        <h1>{{text-field class="style-name" value=name}}</h1>
 
         <div class="controls">
           <button {{action save}} {{bind-attr disabled="disableSave"}} class='btn'>{{i18n admin.customize.save}}</button>
@@ -75,4 +75,4 @@
   </div>
 {{else}}
   <p class="about">{{i18n admin.customize.colors.about}}</p>
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/app/assets/javascripts/admin/templates/customize_css_html.js.handlebars b/app/assets/javascripts/admin/templates/customize_css_html.js.handlebars
index db0cb92bd2f..3323c13ba56 100644
--- a/app/assets/javascripts/admin/templates/customize_css_html.js.handlebars
+++ b/app/assets/javascripts/admin/templates/customize_css_html.js.handlebars
@@ -12,7 +12,7 @@
 {{#if selectedItem}}
 <div class='current-style'>
   {{#with selectedItem}}
-    {{textField class="style-name" value=name}}
+    {{text-field class="style-name" value=name}}
 
     <div class='admin-controls'>
       <ul class="nav nav-pills">
diff --git a/app/assets/javascripts/admin/templates/email_all.js.handlebars b/app/assets/javascripts/admin/templates/email_all.js.handlebars
index fc660093273..784136f2d50 100644
--- a/app/assets/javascripts/admin/templates/email_all.js.handlebars
+++ b/app/assets/javascripts/admin/templates/email_all.js.handlebars
@@ -11,10 +11,10 @@
 
   <tr class="filters">
     <td>{{i18n admin.email.logs.filters.title}}</td>
-    <td>{{textField value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}</td>
-    <td>{{textField value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
-    <td>{{textField value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
-    <td>{{textField value=filter.skipped_reason placeholderKey="admin.email.logs.filters.skipped_reason_placeholder"}}</td>
+    <td>{{text-field value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}</td>
+    <td>{{text-field value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
+    <td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
+    <td>{{text-field value=filter.skipped_reason placeholderKey="admin.email.logs.filters.skipped_reason_placeholder"}}</td>
   </tr>
 
   {{#each model}}
diff --git a/app/assets/javascripts/admin/templates/email_index.js.handlebars b/app/assets/javascripts/admin/templates/email_index.js.handlebars
index 19f4d4a7f1f..fea49c2c3de 100644
--- a/app/assets/javascripts/admin/templates/email_index.js.handlebars
+++ b/app/assets/javascripts/admin/templates/email_index.js.handlebars
@@ -17,7 +17,7 @@
   <div class='span15 controls'>{{i18n admin.email.sending_test}}</div>
   {{else}}
   <div class='controls'>
-    {{textField value=testEmailAddress placeholderKey="admin.email.test_email_address"}}
+    {{text-field value=testEmailAddress placeholderKey="admin.email.test_email_address"}}
   </div>
   <div class='span10 controls'>
     <button class='btn' {{action sendTestEmail}} {{bind-attr disabled="sendTestEmailDisabled"}}>{{i18n admin.email.send_test}}</button>
diff --git a/app/assets/javascripts/admin/templates/email_sent.js.handlebars b/app/assets/javascripts/admin/templates/email_sent.js.handlebars
index 753a87f76b7..7da46451077 100644
--- a/app/assets/javascripts/admin/templates/email_sent.js.handlebars
+++ b/app/assets/javascripts/admin/templates/email_sent.js.handlebars
@@ -11,10 +11,10 @@
 
   <tr class="filters">
     <td>{{i18n admin.email.logs.filters.title}}</td>
-    <td>{{textField value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}</td>
-    <td>{{textField value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
-    <td>{{textField value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
-    <td>{{textField value=filter.reply_key placeholderKey="admin.email.logs.filters.reply_key_placeholder"}}</td>
+    <td>{{text-field value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}</td>
+    <td>{{text-field value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
+    <td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
+    <td>{{text-field value=filter.reply_key placeholderKey="admin.email.logs.filters.reply_key_placeholder"}}</td>
   </tr>
 
   {{#each model}}
diff --git a/app/assets/javascripts/admin/templates/email_skipped.js.handlebars b/app/assets/javascripts/admin/templates/email_skipped.js.handlebars
index fc660093273..784136f2d50 100644
--- a/app/assets/javascripts/admin/templates/email_skipped.js.handlebars
+++ b/app/assets/javascripts/admin/templates/email_skipped.js.handlebars
@@ -11,10 +11,10 @@
 
   <tr class="filters">
     <td>{{i18n admin.email.logs.filters.title}}</td>
-    <td>{{textField value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}</td>
-    <td>{{textField value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
-    <td>{{textField value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
-    <td>{{textField value=filter.skipped_reason placeholderKey="admin.email.logs.filters.skipped_reason_placeholder"}}</td>
+    <td>{{text-field value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}</td>
+    <td>{{text-field value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
+    <td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
+    <td>{{text-field value=filter.skipped_reason placeholderKey="admin.email.logs.filters.skipped_reason_placeholder"}}</td>
   </tr>
 
   {{#each model}}
diff --git a/app/assets/javascripts/admin/templates/group.js.handlebars b/app/assets/javascripts/admin/templates/group.js.handlebars
index 1988e84ce70..fccefe35b1c 100644
--- a/app/assets/javascripts/admin/templates/group.js.handlebars
+++ b/app/assets/javascripts/admin/templates/group.js.handlebars
@@ -1,13 +1,13 @@
 {{#if automatic}}
   <h3>{{name}}</h3>
 {{else}}
-  {{textField value=name placeholderKey="admin.groups.name_placeholder"}}
+  {{text-field value=name placeholderKey="admin.groups.name_placeholder"}}
 {{/if}}
 
 <div class="control-group">
   <label class="control-label">{{i18n admin.groups.group_members}}</label>
   <div class="controls">
-    {{userSelector usernames=usernames id="group-users" placeholderKey="admin.groups.selector_placeholder" tabindex="1" disabled=automatic}}
+    {{user-selector usernames=usernames id="group-users" placeholderKey="admin.groups.selector_placeholder" tabindex="1" disabled=automatic}}
   </div>
 </div>
 <div class="control-group">
diff --git a/app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.js.handlebars b/app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.js.handlebars
index 54fdc7bca35..130fa69a9a6 100644
--- a/app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.js.handlebars
+++ b/app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.js.handlebars
@@ -1,6 +1,6 @@
 <div class="col first ip_address">
   {{#if editing}}
-    {{textField value=ip_address autofocus="autofocus"}}
+    {{text-field value=ip_address autofocus="autofocus"}}
   {{else}}
     <span {{action edit this}}>{{ip_address}}</span>
   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin_suspend_user.js.handlebars b/app/assets/javascripts/admin/templates/modal/admin_suspend_user.js.handlebars
index f2b83891bf3..7e9a99db034 100644
--- a/app/assets/javascripts/admin/templates/modal/admin_suspend_user.js.handlebars
+++ b/app/assets/javascripts/admin/templates/modal/admin_suspend_user.js.handlebars
@@ -1,12 +1,12 @@
 <div class="modal-body">
   <form>
     {{i18n admin.user.suspend_duration}}
-    {{textField value=duration maxlength="5" autofocus="autofocus"}}
+    {{text-field value=duration maxlength="5" autofocus="autofocus"}}
     {{i18n admin.user.suspend_duration_units}}<br/>
     <br/>
     {{{i18n admin.user.suspend_reason_label}}}<br/>
     <br/>
-    {{textField value=reason class="span8"}}
+    {{text-field value=reason class="span8"}}
   </form>
 </div>
 <div class="modal-footer">
diff --git a/app/assets/javascripts/admin/templates/site_settings.js.handlebars b/app/assets/javascripts/admin/templates/site_settings.js.handlebars
index 98abcb2f980..d1a7f94d80e 100644
--- a/app/assets/javascripts/admin/templates/site_settings.js.handlebars
+++ b/app/assets/javascripts/admin/templates/site_settings.js.handlebars
@@ -6,7 +6,7 @@
     </label>
   </div>
   <div class='controls'>
-    {{textField value=filter placeholderKey="type_to_filter"}}
+    {{text-field value=filter placeholderKey="type_to_filter"}}
     <button {{action clearFilter}} class="btn">{{i18n admin.site_settings.clear_filter}}</button>
   </div>
 </div>
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 a04b2d763a2..f3a531edc5c 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
@@ -2,7 +2,7 @@
    <h3>{{unbound settingName}}</h3>
 </div>
 <div class="setting-value">
-  {{textField value=value classNames="input-setting-string"}}
+  {{text-field value=value classNames="input-setting-string"}}
   <div {{bind-attr class=":validation-error validationMessage::hidden"}}><i class='fa fa-times'></i> {{validationMessage}}</div>
   <div class='desc'>{{unbound description}}</div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/user.js.handlebars b/app/assets/javascripts/admin/templates/user.js.handlebars
index e2147cab02d..c24cd68950a 100644
--- a/app/assets/javascripts/admin/templates/user.js.handlebars
+++ b/app/assets/javascripts/admin/templates/user.js.handlebars
@@ -1 +1 @@
-{{outlet}}
\ No newline at end of file
+{{outlet}}
diff --git a/app/assets/javascripts/admin/templates/user_index.js.handlebars b/app/assets/javascripts/admin/templates/user_index.js.handlebars
index 76cf69cdbd7..c195ad16fb4 100644
--- a/app/assets/javascripts/admin/templates/user_index.js.handlebars
+++ b/app/assets/javascripts/admin/templates/user_index.js.handlebars
@@ -37,7 +37,7 @@
     <div class='field'>{{i18n user.title.title}}</div>
     <div class='value'>
       {{#if editingTitle}}
-        {{textField value=title autofocus="autofocus"}}
+        {{text-field value=title autofocus="autofocus"}}
       {{else}}
         <span {{action toggleTitleEdit}}>{{title}}&nbsp;</span>
       {{/if}}
diff --git a/app/assets/javascripts/admin/templates/users_list.js.handlebars b/app/assets/javascripts/admin/templates/users_list.js.handlebars
index b51cdb7d1bb..6c2fd2fc50d 100644
--- a/app/assets/javascripts/admin/templates/users_list.js.handlebars
+++ b/app/assets/javascripts/admin/templates/users_list.js.handlebars
@@ -13,7 +13,7 @@
     </ul>
   </div>
   <div class='username controls'>
-    {{textField value=username placeholderKey="username"}}
+    {{text-field value=username placeholderKey="username"}}
   </div>
 </div>
 
diff --git a/app/assets/javascripts/admin/views/report/admin_report_counts_view.js b/app/assets/javascripts/admin/views/report/admin_report_counts_view.js
index 0ef5d996149..fb7bb9c6286 100644
--- a/app/assets/javascripts/admin/views/report/admin_report_counts_view.js
+++ b/app/assets/javascripts/admin/views/report/admin_report_counts_view.js
@@ -1,4 +1,4 @@
 Discourse.AdminReportCountsView = Discourse.View.extend({
   templateName: 'admin/templates/reports/summed_counts_report',
   tagName: 'tbody'
-});
\ No newline at end of file
+});
diff --git a/app/assets/javascripts/discourse/ember/event_dispatcher.js b/app/assets/javascripts/discourse/ember/event_dispatcher.js
index 700186f3169..7e5cea6fc71 100644
--- a/app/assets/javascripts/discourse/ember/event_dispatcher.js
+++ b/app/assets/javascripts/discourse/ember/event_dispatcher.js
@@ -30,4 +30,4 @@ Ember.EventDispatcher.reopen({
     drop        : 'drop',
     dragend     : 'dragEnd'
   }
-});
\ No newline at end of file
+});
diff --git a/app/assets/javascripts/discourse/helpers/grouped_each.js b/app/assets/javascripts/discourse/helpers/grouped_each.js
index 86c3ce13d1d..d730ede8f43 100644
--- a/app/assets/javascripts/discourse/helpers/grouped_each.js
+++ b/app/assets/javascripts/discourse/helpers/grouped_each.js
@@ -130,4 +130,4 @@ Ember.Handlebars.registerHelper('groupedEach', function(path, options) {
   options.hash.dataSourceBinding = path;
   options.data.insideGroup = true;
   new DiscourseGroupedEach(this, path, options).render();
-});
\ No newline at end of file
+});
diff --git a/app/assets/javascripts/discourse/initializers/deprecations.js.es6 b/app/assets/javascripts/discourse/initializers/deprecations.js.es6
index 2850b6da495..2bb5733132f 100644
--- a/app/assets/javascripts/discourse/initializers/deprecations.js.es6
+++ b/app/assets/javascripts/discourse/initializers/deprecations.js.es6
@@ -1,6 +1,8 @@
 var deprecatedViewHelpers = {
   inputTip: 'input-tip',
-  pagedown: 'pagedown-editor'
+  pagedown: 'pagedown-editor',
+  textField: 'text-field',
+  userSelector: 'user-selector'
 };
 
 export default {
diff --git a/app/assets/javascripts/discourse/initializers/view-helpers.js.es6 b/app/assets/javascripts/discourse/initializers/view-helpers.js.es6
index d4014b32f28..2c5d144af6a 100644
--- a/app/assets/javascripts/discourse/initializers/view-helpers.js.es6
+++ b/app/assets/javascripts/discourse/initializers/view-helpers.js.es6
@@ -1,4 +1,4 @@
-var helpers = ['input-tip', 'pagedown-editor'];
+var helpers = ['input-tip', 'pagedown-editor', 'text-field', 'user-selector'];
 
 /**
   Creates view helpers for some views. Many of these should probably be converted
@@ -9,8 +9,8 @@ export default {
   initialize: function(container) {
     helpers.forEach(function(h) {
       Ember.Handlebars.registerHelper(h, function(options) {
-        var helper = container.lookupFactory('view:' + h);
-        var hash = options.hash,
+        var helper = container.lookupFactory('view:' + h),
+            hash = options.hash,
             types = options.hashTypes;
 
         Discourse.Utilities.normalizeHash(hash, types);
diff --git a/app/assets/javascripts/discourse/mixins/scrolling.js b/app/assets/javascripts/discourse/mixins/scrolling.js
index ff3f1b65620..b86631de22d 100644
--- a/app/assets/javascripts/discourse/mixins/scrolling.js
+++ b/app/assets/javascripts/discourse/mixins/scrolling.js
@@ -65,4 +65,4 @@ Discourse.ScrollingDOMMethods = {
     $(document).unbind('touchmove.discourse-' + name);
   }
 
-};
\ No newline at end of file
+};
diff --git a/app/assets/javascripts/discourse/models/composer_message.js b/app/assets/javascripts/discourse/models/composer_message.js
index fc445340efe..106a4d12bf3 100644
--- a/app/assets/javascripts/discourse/models/composer_message.js
+++ b/app/assets/javascripts/discourse/models/composer_message.js
@@ -32,4 +32,4 @@ Discourse.ComposerMessage.reopenClass({
     });
   }
 
-});
\ No newline at end of file
+});
diff --git a/app/assets/javascripts/discourse/models/trust_level.js b/app/assets/javascripts/discourse/models/trust_level.js
index 673077b4026..86940101199 100644
--- a/app/assets/javascripts/discourse/models/trust_level.js
+++ b/app/assets/javascripts/discourse/models/trust_level.js
@@ -8,4 +8,4 @@
 **/
 Discourse.TrustLevel = Discourse.Model.extend({
   detailedName: Discourse.computed.fmt('id', 'name', '%@ - %@')
-});
\ No newline at end of file
+});
diff --git a/app/assets/javascripts/discourse/routes/user_invited_route.js b/app/assets/javascripts/discourse/routes/user_invited_route.js
index 98afbdaad7d..3856e383a6a 100644
--- a/app/assets/javascripts/discourse/routes/user_invited_route.js
+++ b/app/assets/javascripts/discourse/routes/user_invited_route.js
@@ -37,4 +37,4 @@ Discourse.UserInvitedRoute = Discourse.Route.extend({
     }
   }
 
-});
\ No newline at end of file
+});
diff --git a/app/assets/javascripts/discourse/templates/category_notification_dropdown.js.handlebars b/app/assets/javascripts/discourse/templates/category_notification_dropdown.js.handlebars
index dbf82240a92..22d91f0f728 100644
--- a/app/assets/javascripts/discourse/templates/category_notification_dropdown.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/category_notification_dropdown.js.handlebars
@@ -14,4 +14,4 @@
     </li>
   {{/each}}
 </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/assets/javascripts/discourse/templates/choose_topic.js.handlebars b/app/assets/javascripts/discourse/templates/choose_topic.js.handlebars
index 7f9cbf87961..a26ad376765 100644
--- a/app/assets/javascripts/discourse/templates/choose_topic.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/choose_topic.js.handlebars
@@ -1,6 +1,6 @@
 <label for='choose-topic-title'>{{i18n choose_topic.title.search}}</label>
 
-{{textField value=view.topicTitle placeholderKey="choose_topic.title.placeholder" id="choose-topic-title"}}
+{{text-field value=view.topicTitle placeholderKey="choose_topic.title.placeholder" id="choose-topic-title"}}
 
 {{#if view.loading}}
   <p>{{i18n loading}}</p>
diff --git a/app/assets/javascripts/discourse/templates/components/auto-close-form.js.handlebars b/app/assets/javascripts/discourse/templates/components/auto-close-form.js.handlebars
index 3493a3d89f5..11479923a7a 100644
--- a/app/assets/javascripts/discourse/templates/components/auto-close-form.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/components/auto-close-form.js.handlebars
@@ -2,7 +2,7 @@
   <div>
     <i class="fa fa-clock-o"></i>
     {{label}}
-    {{textField value=autoCloseTime}}
+    {{text-field value=autoCloseTime}}
     {{i18n composer.auto_close_units}}
   </div>
   <div class="examples">
diff --git a/app/assets/javascripts/discourse/templates/components/color-input.js.handlebars b/app/assets/javascripts/discourse/templates/components/color-input.js.handlebars
index 18e2b107c01..e69d19d7e10 100644
--- a/app/assets/javascripts/discourse/templates/components/color-input.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/components/color-input.js.handlebars
@@ -1 +1 @@
-{{textField class="hex-input" value=hexValue maxlength="6"}}
+{{text-field class="hex-input" value=hexValue maxlength="6"}}
diff --git a/app/assets/javascripts/discourse/templates/components/screened-ip-address-form.handlebars b/app/assets/javascripts/discourse/templates/components/screened-ip-address-form.handlebars
index 883c21b13f0..9635dd3e5cd 100644
--- a/app/assets/javascripts/discourse/templates/components/screened-ip-address-form.handlebars
+++ b/app/assets/javascripts/discourse/templates/components/screened-ip-address-form.handlebars
@@ -1,4 +1,4 @@
 <b>{{i18n admin.logs.screened_ips.form.label}}</b>
-{{textField value=ip_address disabled=formSubmitted class="ip-address-input" placeholderKey="admin.logs.screened_ips.form.ip_address" autocorrect="off" autocapitalize="off"}}
+{{text-field value=ip_address disabled=formSubmitted class="ip-address-input" placeholderKey="admin.logs.screened_ips.form.ip_address" autocorrect="off" autocapitalize="off"}}
 {{combobox content=actionNames value=actionName}}
 <button class="btn btn-small" {{action submit target="view"}} {{bind-attr disabled="formSubmitted"}}>{{i18n admin.logs.screened_ips.form.add}}</button>
diff --git a/app/assets/javascripts/discourse/templates/composer.js.handlebars b/app/assets/javascripts/discourse/templates/composer.js.handlebars
index af51ac6963e..12b3cc8cfa0 100644
--- a/app/assets/javascripts/discourse/templates/composer.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/composer.js.handlebars
@@ -16,7 +16,7 @@
           {{#if canEdit}}
             {{#if showEditReason}}
               <div class="edit-reason-input">
-                {{textField value=editReason tabindex="5" id="edit-reason" maxlength="255" placeholderKey="composer.edit_reason_placeholder"}}
+                {{text-field value=editReason tabindex="5" id="edit-reason" maxlength="255" placeholderKey="composer.edit_reason_placeholder"}}
               </div>
             {{else}}
               <a {{action displayEditReason}} class="display-edit-reason">{{i18n composer.show_edit_reason}}</a>
@@ -27,18 +27,18 @@
         {{#if model.canEditTitle}}
           <div class='form-element clearfix'>
             {{#if model.creatingPrivateMessage}}
-              {{userSelector topicId=controller.controllers.topic.model.id
-                             excludeCurrentUser="true"
-                             id="private-message-users"
-                             include_groups="true"
-                             class="span8"
-                             placeholderKey="composer.users_placeholder"
-                             tabindex="1"
-                             usernames=model.targetUsernames}}
+              {{user-selector topicId=controller.controllers.topic.model.id
+                              excludeCurrentUser="true"
+                              id="private-message-users"
+                              include_groups="true"
+                              class="span8"
+                              placeholderKey="composer.users_placeholder"
+                              tabindex="1"
+                              usernames=model.targetUsernames}}
             {{/if}}
 
             <div class="title-input">
-              {{textField value=model.title tabindex="2" id="reply-title" maxlength="255" placeholderKey="composer.title_placeholder"}}
+              {{text-field value=model.title tabindex="2" id="reply-title" maxlength="255" placeholderKey="composer.title_placeholder"}}
               {{popupInputTip validation=view.titleValidation shownAt=view.showTitleTip}}
             </div>
 
diff --git a/app/assets/javascripts/discourse/templates/mobile/modal/login.js.handlebars b/app/assets/javascripts/discourse/templates/mobile/modal/login.js.handlebars
index 644dd2221b7..d9e39cbecde 100644
--- a/app/assets/javascripts/discourse/templates/mobile/modal/login.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/mobile/modal/login.js.handlebars
@@ -19,7 +19,7 @@
               <label for='login-account-name'>{{i18n login.username}}&nbsp;</label>
             </td>
             <td>
-              {{textField value=loginName placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off"}}
+              {{text-field value=loginName placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off"}}
             </td>
           </tr>
           <tr>
@@ -27,7 +27,7 @@
                 <label for='login-account-password'>{{i18n login.password}}&nbsp;</label>
             </td>
             <td>
-                {{textField value=loginPassword type="password" id="login-account-password"}} &nbsp;
+                {{text-field value=loginPassword type="password" id="login-account-password"}} &nbsp;
             </td>
           </tr>
           <tr>
diff --git a/app/assets/javascripts/discourse/templates/modal/change_owner.js.handlebars b/app/assets/javascripts/discourse/templates/modal/change_owner.js.handlebars
index bcf7469d082..6a4ebc637c1 100644
--- a/app/assets/javascripts/discourse/templates/modal/change_owner.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/change_owner.js.handlebars
@@ -6,7 +6,7 @@
 
   <form>
       <label>{{i18n topic.change_owner.label}}</label>
-    {{userSelector single=true usernames=new_user include_groups="false" placeholderKey="topic.change_owner.placeholder"}}
+    {{user-selector single=true usernames=new_user include_groups="false" placeholderKey="topic.change_owner.placeholder"}}
   </form>
 
 </div>
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 17328de77f6..878d200cda5 100644
--- a/app/assets/javascripts/discourse/templates/modal/create_account.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/create_account.js.handlebars
@@ -6,7 +6,7 @@
       <tr class="input">
           <td style="width:80px" class="label"><label for='new-account-name'>{{i18n user.name.title}}</label></td>
           <td style="width:496px">
-          {{textField value=accountName id="new-account-name" autofocus="autofocus"}}
+          {{text-field value=accountName id="new-account-name" autofocus="autofocus"}}
           &nbsp;{{input-tip validation=nameValidation}}
           </td>
       </tr>
diff --git a/app/assets/javascripts/discourse/templates/modal/edit_category.js.handlebars b/app/assets/javascripts/discourse/templates/modal/edit_category.js.handlebars
index 3b8fb414d1e..29a85c42d4b 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit_category.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/edit_category.js.handlebars
@@ -18,7 +18,7 @@
       <form>
         <section class='field'>
           <label>{{i18n category.name}}</label>
-          {{textField value=name placeholderKey="category.name_placeholder" maxlength="50"}}
+          {{text-field value=name placeholderKey="category.name_placeholder" maxlength="50"}}
         </section>
 
         <section class='field'>
@@ -56,13 +56,13 @@
 
             <div class='input-prepend input-append' style="margin-top: 10px;">
               <span class='color-title'>{{i18n category.background_color}}:</span>
-              <span class='add-on'>#</span>{{textField value=color placeholderKey="category.color_placeholder" maxlength="6"}}
+              <span class='add-on'>#</span>{{text-field value=color placeholderKey="category.color_placeholder" maxlength="6"}}
               {{colorPicker colors=backgroundColors usedColors=usedBackgroundColors value=color}}
             </div>
 
             <div class='input-prepend input-append'>
               <span class='color-title'>{{i18n category.foreground_color}}:</span>
-              <span class='add-on'>#</span>{{textField value=text_color placeholderKey="category.color_placeholder" maxlength="6"}}
+              <span class='add-on'>#</span>{{text-field value=text_color placeholderKey="category.color_placeholder" maxlength="6"}}
               {{colorPicker colors=foregroundColors value=text_color}}
             </div>
           </div>
@@ -99,7 +99,7 @@
             <div>
               <i class="fa fa-clock-o"></i>
               {{i18n category.auto_close_label}}
-              {{textField value=auto_close_hours}}
+              {{text-field value=auto_close_hours}}
               {{i18n category.auto_close_units}}
             </div>
           </div>
@@ -111,7 +111,7 @@
               <div>
                 <i class="fa fa-envelope-o"></i>
                 {{i18n category.email_in}}
-                {{textField value=email_in}}
+                {{text-field value=email_in}}
               </div>
               <div>
                 <label class="checkbox-label">
@@ -126,7 +126,7 @@
         {{#if showPositionInput}}
           <section class='field'>
             <label>{{i18n category.position}}</label>
-            {{textField value=position class="position-input"}}
+            {{text-field value=position class="position-input"}}
           </section>
         {{else}}
           <p>{{i18n category.position_disabled}}</p>
diff --git a/app/assets/javascripts/discourse/templates/modal/forgot_password.js.handlebars b/app/assets/javascripts/discourse/templates/modal/forgot_password.js.handlebars
index 4bc864bd67e..7c9c2d84157 100644
--- a/app/assets/javascripts/discourse/templates/modal/forgot_password.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/forgot_password.js.handlebars
@@ -1,7 +1,7 @@
 <form>
     <div class="modal-body">
       <label for='username-or-email'>{{i18n forgot_password.invite}}</label>
-      {{textField value=accountEmailOrUsername placeholderKey="login.email_placeholder" id="username-or-email" autocorrect="off" autocapitalize="off"}}
+      {{text-field value=accountEmailOrUsername placeholderKey="login.email_placeholder" id="username-or-email" autocorrect="off" autocapitalize="off"}}
     </div>
     <div class="modal-footer">
       <button class='btn btn-large btn-primary' {{bind-attr disabled="submitDisabled"}} {{action submit}}>{{i18n forgot_password.reset}}</button>
diff --git a/app/assets/javascripts/discourse/templates/modal/invite.js.handlebars b/app/assets/javascripts/discourse/templates/modal/invite.js.handlebars
index 1d24dd64480..772f21d9da9 100644
--- a/app/assets/javascripts/discourse/templates/modal/invite.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/invite.js.handlebars
@@ -11,7 +11,7 @@
   {{else}}
 
     <label>{{inviteInstructions}}</label>
-    {{textField value=email placeholderKey="topic.invite_reply.email_placeholder"}}
+    {{text-field value=email placeholderKey="topic.invite_reply.email_placeholder"}}
 
     {{#if isAdmin}}
       <label>{{i18n topic.automatically_add_to_groups}}</label>
diff --git a/app/assets/javascripts/discourse/templates/modal/invite_private.js.handlebars b/app/assets/javascripts/discourse/templates/modal/invite_private.js.handlebars
index 46fdc24792b..30ea58dcd45 100644
--- a/app/assets/javascripts/discourse/templates/modal/invite_private.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/invite_private.js.handlebars
@@ -10,7 +10,7 @@
     {{i18n topic.invite_private.success}}
   {{else}}
     <label>{{i18n topic.invite_private.email_or_username}}</label>
-    {{userSelector single=true allowAny=true usernames=emailOrUsername include_groups="true" placeholderKey="topic.invite_private.email_or_username_placeholder"}}
+    {{user-selector single=true allowAny=true usernames=emailOrUsername include_groups="true" placeholderKey="topic.invite_private.email_or_username_placeholder"}}
   {{/if}}
 </div>
 <div class="modal-footer">
diff --git a/app/assets/javascripts/discourse/templates/modal/login.js.handlebars b/app/assets/javascripts/discourse/templates/modal/login.js.handlebars
index d338e2b8581..4ac5a9f1896 100644
--- a/app/assets/javascripts/discourse/templates/modal/login.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/login.js.handlebars
@@ -18,7 +18,7 @@
               <label for='login-account-name'>{{i18n login.username}}&nbsp;</label>
             </td>
             <td>
-              {{textField value=loginName placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off" autofocus="autofocus"}}
+              {{text-field value=loginName placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off" autofocus="autofocus"}}
             </td>
             <td></td>
           </tr>
@@ -27,7 +27,7 @@
                 <label for='login-account-password'>{{i18n login.password}}&nbsp;</label>
             </td>
             <td>
-                {{textField value=loginPassword type="password" id="login-account-password"}} &nbsp;
+                {{text-field value=loginPassword type="password" id="login-account-password"}} &nbsp;
             </td>
             <td>
               <a id="forgot-password-link" {{action showForgotPassword}}>{{i18n forgot_password.action}}</a>
diff --git a/app/assets/javascripts/discourse/templates/modal/split_topic.js.handlebars b/app/assets/javascripts/discourse/templates/modal/split_topic.js.handlebars
index 4bad9d2bd19..579b204a613 100644
--- a/app/assets/javascripts/discourse/templates/modal/split_topic.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/split_topic.js.handlebars
@@ -9,7 +9,7 @@
 
   <form>
     <label>{{i18n topic.split_topic.topic_name}}</label>
-    {{textField value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
+    {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
 
     <label>{{i18n categories.category}}</label>
     {{categoryChooser value=categoryId}}
diff --git a/app/assets/javascripts/discourse/templates/search.js.handlebars b/app/assets/javascripts/discourse/templates/search.js.handlebars
index 114029e990c..68f7a971b97 100644
--- a/app/assets/javascripts/discourse/templates/search.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/search.js.handlebars
@@ -1,4 +1,4 @@
-{{view Discourse.SearchTextField valueBinding="term" searchContextBinding="searchContext" id="search-term"}}
+{{view 'search-text-field' value=term searchContext=searchContext id="search-term"}}
 {{#unless loading}}
   {{#unless noResults}}
     {{#each resultType in content}}
diff --git a/app/assets/javascripts/discourse/templates/topic.js.handlebars b/app/assets/javascripts/discourse/templates/topic.js.handlebars
index eb3a4f044de..b3135ce5d1c 100644
--- a/app/assets/javascripts/discourse/templates/topic.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/topic.js.handlebars
@@ -20,7 +20,7 @@
             {{else}}
               {{categoryChooser valueAttribute="id" value=newCategoryId source=category_id}}
             {{/if}}
-            {{textField id='edit-title' value=newTitle}}
+            {{text-field id='edit-title' value=newTitle}}
 
             <button class='btn btn-primary btn-small no-text' {{action finishedEditingTopic}}><i class='fa fa-check'></i></button>
             <button class='btn btn-small no-text' {{action cancelEditingTopic}}><i class='fa fa-times'></i></button>
diff --git a/app/assets/javascripts/discourse/templates/user/email.js.handlebars b/app/assets/javascripts/discourse/templates/user/email.js.handlebars
index 1f59f77c3ed..266d2afd384 100644
--- a/app/assets/javascripts/discourse/templates/user/email.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/user/email.js.handlebars
@@ -25,7 +25,7 @@
       <div class="control-group">
         <label class="control-label">{{i18n user.email.title}}</label>
         <div class="controls">
-          {{textField value=newEmail id="change_email" classNames="input-xxlarge"}}
+          {{text-field value=newEmail id="change_email" classNames="input-xxlarge"}}
         </div>
         <div class='instructions'>
           {{#if taken}}
diff --git a/app/assets/javascripts/discourse/templates/user/invited.js.handlebars b/app/assets/javascripts/discourse/templates/user/invited.js.handlebars
index 96b77f17c43..6bf4e5a241a 100644
--- a/app/assets/javascripts/discourse/templates/user/invited.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/user/invited.js.handlebars
@@ -8,7 +8,7 @@
 
   {{#if showSearch}}
   <form>
-    {{textField value=searchTerm placeholderKey="user.invited.search"}}
+    {{text-field value=searchTerm placeholderKey="user.invited.search"}}
   </form>
   {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars b/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
index 037efc9c398..7584d9a5de3 100644
--- a/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
@@ -26,7 +26,7 @@
         <label class="control-label">{{i18n user.name.title}}</label>
         <div class="controls">
           {{#if can_edit_name}}
-            {{textField value=newNameInput classNames="input-xxlarge"}}
+            {{text-field value=newNameInput classNames="input-xxlarge"}}
           {{else}}
             <span class='static'>{{name}}</span>
           {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user/username.js.handlebars b/app/assets/javascripts/discourse/templates/user/username.js.handlebars
index 1d571721c8d..91c861ff6c1 100644
--- a/app/assets/javascripts/discourse/templates/user/username.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/user/username.js.handlebars
@@ -18,7 +18,7 @@
     <div class="control-group">
       <label class="control-label">{{i18n user.username.title}}</label>
       <div class="controls">
-        {{textField value=newUsername id="change_username" classNames="input-xxlarge" maxlengthBinding="Discourse.SiteSettings.max_username_length"}}
+        {{text-field value=newUsername id="change_username" classNames="input-xxlarge" maxlengthBinding="Discourse.SiteSettings.max_username_length"}}
       </div>
       <div class='instructions'>
         {{#if taken}}
diff --git a/app/assets/javascripts/discourse/views/buttons/invite_reply_button.js b/app/assets/javascripts/discourse/views/buttons/invite_reply_button.js
index 133efa2293f..f2c68555435 100644
--- a/app/assets/javascripts/discourse/views/buttons/invite_reply_button.js
+++ b/app/assets/javascripts/discourse/views/buttons/invite_reply_button.js
@@ -19,4 +19,4 @@ Discourse.InviteReplyButton = Discourse.ButtonView.extend({
   click: function() {
     return this.get('controller').send('showInvite');
   }
-});
\ No newline at end of file
+});
diff --git a/app/assets/javascripts/discourse/views/buttons/login_reply_button.js b/app/assets/javascripts/discourse/views/buttons/login_reply_button.js
index 286f2b1ebae..e1abb3e1a42 100644
--- a/app/assets/javascripts/discourse/views/buttons/login_reply_button.js
+++ b/app/assets/javascripts/discourse/views/buttons/login_reply_button.js
@@ -15,4 +15,4 @@ Discourse.LoginReplyButton = Discourse.ButtonView.extend({
   renderIcon: function(buffer) {
     buffer.push("<i class='fa fa-user'></i>");
   }
-});
\ No newline at end of file
+});
diff --git a/app/assets/javascripts/discourse/views/composer/composer_view.js b/app/assets/javascripts/discourse/views/composer/composer_view.js
index 1f36698cb12..71c2c3d6f87 100644
--- a/app/assets/javascripts/discourse/views/composer/composer_view.js
+++ b/app/assets/javascripts/discourse/views/composer/composer_view.js
@@ -176,8 +176,8 @@ Discourse.ComposerView = Discourse.View.extend(Ember.Evented, {
 
     $LAB.script(assetPath('defer/html-sanitizer-bundle'));
     Discourse.ComposerView.trigger("initWmdEditor");
-    var template = Discourse.UserSelector.templateFunction();
 
+    var template = this.container.lookupFactory('view:user-selector').templateFunction();
     $wmdInput.data('init', true);
     $wmdInput.autocomplete({
       template: template,
diff --git a/app/assets/javascripts/discourse/views/container_view.js b/app/assets/javascripts/discourse/views/container_view.js
index 65b3e70ae33..df3752de743 100644
--- a/app/assets/javascripts/discourse/views/container_view.js
+++ b/app/assets/javascripts/discourse/views/container_view.js
@@ -32,4 +32,4 @@ Discourse.ContainerView = Ember.ContainerView.extend(Discourse.Presence, {
     this.attachViewWithArgs(null, viewClass);
   }
 
-});
\ No newline at end of file
+});
diff --git a/app/assets/javascripts/discourse/views/search/search_text_field.js b/app/assets/javascripts/discourse/views/search-text-field.js.es6
similarity index 89%
rename from app/assets/javascripts/discourse/views/search/search_text_field.js
rename to app/assets/javascripts/discourse/views/search-text-field.js.es6
index cf413d26a3a..9a1d05d6266 100644
--- a/app/assets/javascripts/discourse/views/search/search_text_field.js
+++ b/app/assets/javascripts/discourse/views/search-text-field.js.es6
@@ -6,7 +6,10 @@
   @namespace Discourse
   @module Discourse
 **/
-Discourse.SearchTextField = Discourse.TextField.extend({
+
+import TextField from 'discourse/views/text-field';
+
+export default TextField.extend({
 
   /**
     A dynamic placeholder for the search field based on our context
@@ -27,7 +30,4 @@ Discourse.SearchTextField = Discourse.TextField.extend({
 
     return I18n.t('search.placeholder');
   }.property('searchContext')
-
 });
-
-
diff --git a/app/assets/javascripts/discourse/views/discourse_text_field.js b/app/assets/javascripts/discourse/views/text-field.js.es6
similarity index 78%
rename from app/assets/javascripts/discourse/views/discourse_text_field.js
rename to app/assets/javascripts/discourse/views/text-field.js.es6
index 098324ed859..dd791810a4a 100644
--- a/app/assets/javascripts/discourse/views/discourse_text_field.js
+++ b/app/assets/javascripts/discourse/views/text-field.js.es6
@@ -6,7 +6,7 @@
   @namespace Discourse
   @module Discourse
 **/
-Discourse.TextField = Ember.TextField.extend({
+export default Ember.TextField.extend({
   attributeBindings: ['autocorrect', 'autocapitalize', 'autofocus'],
 
   placeholder: function() {
@@ -16,7 +16,4 @@ Discourse.TextField = Ember.TextField.extend({
       return '';
     }
   }.property('placeholderKey')
-
 });
-
-Discourse.View.registerHelper('textField', Discourse.TextField);
diff --git a/app/assets/javascripts/discourse/views/user-selector.js.es6 b/app/assets/javascripts/discourse/views/user-selector.js.es6
new file mode 100644
index 00000000000..c3f501466cb
--- /dev/null
+++ b/app/assets/javascripts/discourse/views/user-selector.js.es6
@@ -0,0 +1,108 @@
+import TextField from 'discourse/views/text-field';
+
+var compiled;
+function templateFunction() {
+  if (!compiled) {
+    Handlebars.registerHelper("showMax", function(context, block) {
+      var maxLength = parseInt(block.hash.max) || 3;
+      if (context.length > maxLength){
+        return context.slice(0, maxLength).join(", ") + ", +" + (context.length - maxLength);
+      } else {
+        return context.join(", ");
+      }
+    });
+
+    compiled = Handlebars.compile(
+      "<div class='autocomplete'>" +
+        "<ul>" +
+        "{{#each options.users}}" +
+          "<li>" +
+              "<a href='#'>{{avatar this imageSize=\"tiny\"}} " +
+              "<span class='username'>{{this.username}}</span> " +
+              "<span class='name'>{{this.name}}</span></a>" +
+          "</li>" +
+        "{{/each}}" +
+        "{{#if options.groups}}" +
+          "{{#if options.users}}<hr>{{/if}}"+
+            "{{#each options.groups}}" +
+              "<li>" +
+                "<a href=''><i class='icon-group'></i>" +
+                  "<span class='username'>{{this.name}}</span> " +
+                  "<span class='name'>{{showMax this.usernames max=3}}</span>" +
+                "</a>" +
+              "</li>" +
+            "{{/each}}" +
+          "{{/if}}" +
+        "</ul>" +
+      "</div>");
+  }
+  return compiled;
+}
+
+var UserSelector = TextField.extend({
+
+  didInsertElement: function() {
+    var userSelectorView = this,
+        selected = [];
+
+    function excludedUsernames() {
+      var exclude = selected;
+      if (userSelectorView.get('excludeCurrentUser')) {
+        exclude = exclude.concat([Discourse.User.currentProp('username')]);
+      }
+      return exclude;
+    }
+
+    $(this.get('element')).val(this.get('usernames')).autocomplete({
+      template: templateFunction(),
+
+      disabled: this.get('disabled'),
+      single: this.get('single'),
+      allowAny: this.get('allowAny'),
+
+      dataSource: function(term) {
+        return Discourse.UserSearch.search({
+          term: term,
+          topicId: userSelectorView.get('topicId'),
+          exclude: excludedUsernames(),
+          include_groups: userSelectorView.get('include_groups')
+        });
+      },
+
+      transformComplete: function(v) {
+        if (v.username) {
+          return v.username;
+        } else {
+          var excludes = excludedUsernames();
+          return v.usernames.filter(function(item){
+                // include only, those not found in the exclude list
+                return excludes.indexOf(item) === -1;
+              });
+        }
+      },
+
+      onChangeItems: function(items) {
+        items = _.map(items, function(i) {
+          if (i.username) {
+            return i.username;
+          } else {
+            return i;
+          }
+        });
+        userSelectorView.set('usernames', items.join(","));
+        selected = items;
+      },
+
+      reverseTransform: function(i) {
+        return { username: i };
+      }
+
+    });
+  }
+
+});
+
+
+UserSelector.reopenClass({ templateFunction: templateFunction });
+
+export default UserSelector;
diff --git a/app/assets/javascripts/discourse/views/user_selector_view.js b/app/assets/javascripts/discourse/views/user_selector_view.js
deleted file mode 100644
index 9cb4a7bc7ee..00000000000
--- a/app/assets/javascripts/discourse/views/user_selector_view.js
+++ /dev/null
@@ -1,103 +0,0 @@
-Discourse.UserSelector = Discourse.TextField.extend({
-
-  didInsertElement: function() {
-    var userSelectorView = this,
-        selected = [];
-
-    function excludedUsernames() {
-      var exclude = selected;
-      if (userSelectorView.get('excludeCurrentUser')) {
-        exclude = exclude.concat([Discourse.User.currentProp('username')]);
-      }
-      return exclude;
-    }
-
-    $(this.get('element')).val(this.get('usernames')).autocomplete({
-      template: Discourse.UserSelector.templateFunction(),
-
-      disabled: this.get('disabled'),
-      single: this.get('single'),
-      allowAny: this.get('allowAny'),
-
-      dataSource: function(term) {
-        return Discourse.UserSearch.search({
-          term: term,
-          topicId: userSelectorView.get('topicId'),
-          exclude: excludedUsernames(),
-          include_groups: userSelectorView.get('include_groups')
-        });
-      },
-
-      transformComplete: function(v) {
-        if (v.username) {
-          return v.username;
-        } else {
-          var excludes = excludedUsernames();
-          return v.usernames.filter(function(item){
-                // include only, those not found in the exclude list
-                return excludes.indexOf(item) === -1;
-              });
-        }
-      },
-
-      onChangeItems: function(items) {
-        items = _.map(items, function(i) {
-          if (i.username) {
-            return i.username;
-          } else {
-            return i;
-          }
-        });
-        userSelectorView.set('usernames', items.join(","));
-        selected = items;
-      },
-
-      reverseTransform: function(i) {
-        return { username: i };
-      }
-
-    });
-  }
-
-});
-
-Handlebars.registerHelper("showMax", function(context, block) {
-  var maxLength = parseInt(block.hash.max) || 3;
-  if (context.length > maxLength){
-    return context.slice(0, maxLength).join(", ") + ", +" + (context.length - maxLength);
-  } else {
-    return context.join(", ");
-  }
-});
-
-Discourse.UserSelector.reopenClass({
-  // I really want to move this into a template file, but I need a handlebars template here, not an ember one
-  templateFunction: function() {
-      this.compiled = this.compiled || Handlebars.compile(
-        "<div class='autocomplete'>" +
-          "<ul>" +
-          "{{#each options.users}}" +
-            "<li>" +
-                "<a href='#'>{{avatar this imageSize=\"tiny\"}} " +
-                "<span class='username'>{{this.username}}</span> " +
-                "<span class='name'>{{this.name}}</span></a>" +
-            "</li>" +
-          "{{/each}}" +
-          "{{#if options.groups}}" +
-            "{{#if options.users}}<hr>{{/if}}"+
-              "{{#each options.groups}}" +
-                "<li>" +
-                  "<a href=''><i class='icon-group'></i>" +
-                    "<span class='username'>{{this.name}}</span> " +
-                    "<span class='name'>{{showMax this.usernames max=3}}</span>" +
-                  "</a>" +
-                "</li>" +
-              "{{/each}}" +
-            "{{/if}}" +
-          "</ul>" +
-        "</div>");
-      return this.compiled;
-    }
-});
-
-Discourse.View.registerHelper('userSelector', Discourse.UserSelector);
diff --git a/app/assets/javascripts/main_include.js b/app/assets/javascripts/main_include.js
index 2e42d1aa372..8455c69b0eb 100644
--- a/app/assets/javascripts/main_include.js
+++ b/app/assets/javascripts/main_include.js
@@ -19,6 +19,7 @@
 //= require ./discourse/controllers/controller
 //= require ./discourse/controllers/object_controller
 //= require ./discourse/controllers/navigation/default
+//= require ./discourse/views/text-field
 //= require ./discourse/views/modal/modal_body_view
 //= require ./discourse/views/modal/flag_view
 //= require ./discourse/views/combobox_view
diff --git a/test/javascripts/templates/search_test.js b/test/javascripts/templates/search_test.js
deleted file mode 100644
index 8277ae96ea6..00000000000
--- a/test/javascripts/templates/search_test.js
+++ /dev/null
@@ -1,181 +0,0 @@
-var controller, oldSearchTextField, oldSearchResultsTypeView, oldViews;
-
-var SearchTextFieldStub = Ember.View.extend({
-  classNames: ["search-text-field-stub"],
-  template: Ember.Handlebars.compile("{{view.value}} {{view.searchContext}}")
-});
-
-var SearchResultsTypeViewStub = Ember.View.extend({
-  classNames: ["search-results-type-view-stub"],
-  template: Ember.Handlebars.compile("{{view.type}} {{view.content}}")
-});
-
-var setUpController = function(properties) {
-  Ember.run(function() {
-    controller.setProperties(properties);
-  });
-};
-
-var appendView = function() {
-  Ember.run(function() {
-    Ember.View.create({
-      container: Discourse.__container__,
-      controller: controller,
-      templateName: "search"
-    }).appendTo(fixture());
-  });
-};
-
-var resultsSectionSelector = "ul";
-var resultsFilterSelector = ".filter";
-var noResultsSelector = ".no-results";
-var searchInProgressSelector = ".searching";
-
-module("Template: search", {
-  setup: function() {
-    sinon.stub(I18n, "t").returnsArg(0);
-
-    oldSearchTextField = Discourse.SearchTextField;
-    Discourse.SearchTextField = SearchTextFieldStub;
-
-    oldSearchResultsTypeView = Discourse.SearchResultsTypeView;
-    Discourse.SearchResultsTypeView = SearchResultsTypeViewStub;
-
-    oldViews = Ember.View.views;
-    Ember.View.views = {};
-
-    controller = Ember.ArrayController.create();
-  },
-
-  teardown: function() {
-    I18n.t.restore();
-
-    Discourse.SearchTextField = oldSearchTextField;
-    Discourse.SearchResultsTypeView = oldSearchResultsTypeView;
-
-    Ember.View.views = oldViews;
-  }
-});
-
-test("contain search text field (correctly bound to contextual placeholder and search term values)", function() {
-  setUpController({
-    term: "term",
-    searchContext: "searchContext"
-  });
-
-  appendView();
-
-  var $searchTextField = fixture(".search-text-field-stub");
-  ok(exists($searchTextField), "the field exists");
-  equal($searchTextField.text(), "term searchContext", "the placeholder and search term values are correctly bound");
-});
-
-test("shows spinner icon instead of results area when loading", function() {
-  setUpController({
-    loading: true
-  });
-
-  appendView();
-
-  ok(exists(fixture(".search-text-field-stub")), "the search field is still shown, even when loading results");
-
-  ok(!exists(fixture(resultsSectionSelector)), "no results are shown");
-  ok(!exists(fixture(noResultsSelector)), "the 'no results' message is not shown");
-
-  var $searchInProgress = fixture(searchInProgressSelector);
-  ok(exists($searchInProgress), "the 'search in progress' message is shown");
-  ok(exists($searchInProgress.find(".fa-spinner")), "the 'search in progress' message contains a spinner icon");
-});
-
-test("shows 'no results' message when loading has finished and there are no results found", function() {
-  setUpController({
-    loading: false,
-    noResults: true
-  });
-
-  appendView();
-
-  ok(exists(fixture(".search-text-field-stub")), "the search field is shown to allow another search");
-
-  ok(!exists(fixture(resultsSectionSelector)), "no results are shown");
-  ok(!exists(fixture(searchInProgressSelector)), "the 'search in progress' message is not shown");
-
-  var $noResults = fixture(noResultsSelector);
-  ok(exists($noResults), "the 'no results' message is shown");
-  notEqual($noResults.text().indexOf("search.no_results"), -1, "the 'no results' message contains correct text");
-});
-
-test("shows only search text field when user starts typing a new search term, but there are not enough characters typed yet", function() {
-  setUpController({
-    loading: false,
-    noResults: false,
-    content: []
-  });
-
-  appendView();
-
-  ok(exists(fixture(".search-text-field-stub")), "search text field is shown");
-
-  ok(!exists(fixture(resultsSectionSelector)), "no results are shown");
-  ok(!exists(fixture(searchInProgressSelector)), "the 'search in progress' message is not shown");
-  ok(!exists(fixture(noResultsSelector)), "the 'no results' message is not shown");
-});
-
-test("correctly iterates through and displays search results when the search succeeds", function() {
-  setUpController({
-    loading: false,
-    noResults: false,
-    content: [
-      Ember.Object.create({
-        more: true,
-        name: "name_1",
-        results: "results_1",
-        type: "type_1"
-      }),
-      Ember.Object.create({
-        more: false,
-        name: "name_2",
-        results: "results_2",
-        type: "type_2"
-      })
-    ]
-  });
-
-  appendView();
-
-  var $resultSections = fixture(resultsSectionSelector);
-
-  equal(count($resultSections), 2, "the number of sections in results is correct");
-
-  var $firstSection = $resultSections.eq(0);
-  var $filter = $firstSection.find(resultsFilterSelector);
-  notEqual($firstSection.text().indexOf("name_1"), -1, "the name of the first section is correct");
-  ok(exists($filter), "the 'show more' link in the first section exists");
-  notEqual($filter.text().indexOf("show_more"), -1, "the 'show more' link in the first section contains correct text");
-  equal($firstSection.find(".search-results-type-view-stub").text(), "type_1 results_1", "the results view in the first section is correctly rendered");
-
-  var $secondSection = $resultSections.eq(1);
-  notEqual($secondSection.text().indexOf("name_2"), -1, "the name of the second section is correct");
-  ok(!exists($secondSection.find(resultsFilterSelector)), "the 'show more' link in the second section does not exist");
-  equal($secondSection.find(".search-results-type-view-stub").text(), "type_2 results_2", "the results view in the second section is correctly rendered");
-});
-
-test("displays 'close more results' button when the search is in the more results mode", function() {
-  setUpController({
-    loading: false,
-    noResults: false,
-    showCancelFilter: true,
-    content: [
-      Ember.Object.create({
-        more: false
-      })
-    ]
-  });
-
-  appendView();
-
-  var $firstSection = fixture(resultsSectionSelector).eq(0);
-  var $filter = $firstSection.find(resultsFilterSelector);
-  ok(exists($filter), "the 'close more results' button exists");
-  ok(exists($filter.find(".fa-times-circle")), "the 'close more results' contains correct icon");
-});
diff --git a/test/javascripts/views/search_text_field_test.js b/test/javascripts/views/search_text_field_test.js
index 8a8ff117fa0..c1f58a4b646 100644
--- a/test/javascripts/views/search_text_field_test.js
+++ b/test/javascripts/views/search_text_field_test.js
@@ -6,13 +6,13 @@ var placeholderUsesKeyAndContext = function(key, context) {
   deepEqual(placeholder.context, context, "correct parameters are passed to the message");
 };
 
-module("Discourse.SearchTextField", {
+module("view:search-text-field", {
   setup: function() {
     sinon.stub(I18n, "t", function(key, context) {
       return {key: key, context: context};
     });
 
-    view = Discourse.SearchTextField.create();
+    view = viewClassFor('search-text-field').create();
   },
 
   teardown: function() {
diff --git a/test/javascripts/views/text_field_test.js b/test/javascripts/views/text_field_test.js
index 1a8290a41ad..1b0986a96df 100644
--- a/test/javascripts/views/text_field_test.js
+++ b/test/javascripts/views/text_field_test.js
@@ -1,5 +1,5 @@
 var appendTextFieldWithProperties = function(properties) {
-  var view = Discourse.TextField.create(properties);
+  var view = viewClassFor('text-field').create(properties);
   Ember.run(function() {
     view.appendTo(fixture());
   });
@@ -13,7 +13,7 @@ var hasNoAttr = function($element, attrName) {
   equal($element.attr(attrName), undefined, "'" + attrName + "' attribute is not rendered");
 };
 
-module("Discourse.TextField");
+module("view:text-field");
 
 test("renders correctly with no properties set", function() {
   appendTextFieldWithProperties({});