diff --git a/app/assets/javascripts/admin/models/admin_user.js b/app/assets/javascripts/admin/models/admin_user.js
index 2e68f50a1..97170627f 100644
--- a/app/assets/javascripts/admin/models/admin_user.js
+++ b/app/assets/javascripts/admin/models/admin_user.js
@@ -64,9 +64,40 @@ Discourse.AdminUser = Discourse.User.extend({
 
   trustLevel: function() {
     var site = Discourse.Site.instance();
+    this.set('originalValue', this.get('trust_level'));
     return site.get('trust_levels').findProperty('id', this.get('trust_level'));
   }.property('trust_level'),
 
+  trustLevels: function() {
+    var site = Discourse.Site.instance();
+    // downgrading trust levels is not supported
+    var current = this.get('trust_level');
+    var levels = site.get('trust_levels');
+    return jQuery.grep(levels, function(e) { return e.id >= current })
+  }.property('trust_level'),
+
+  dirty: function() {
+    return this.get('originalValue') !== parseInt(this.get('trustLevel.id'), 10);
+  }.property('originalValue', 'trustLevel.id'),
+
+  saveTrustLevel: function() {
+    Discourse.ajax("/admin/users/" + this.id + "/trust_level", {
+      type: 'PUT',
+      data: {level: this.get('trustLevel.id')}
+    }).then(function () {
+      // succeeded
+      window.location.reload();
+    }, function(e) {
+      // failure
+      var error = Em.String.i18n('admin.user.trustlevel_change_failed', { error: "http: " + e.status + " - " + e.body });
+      bootbox.alert(error);
+    });
+  },
+
+  restoreTrustLevel: function() {
+    this.set('trustLevel.id', this.get('originalValue'));
+  },
+
   isBanned: (function() {
     return this.get('is_banned') === true;
   }).property('is_banned'),
diff --git a/app/assets/javascripts/admin/templates/user.js.handlebars b/app/assets/javascripts/admin/templates/user.js.handlebars
index 2e953e7f3..60db63a60 100644
--- a/app/assets/javascripts/admin/templates/user.js.handlebars
+++ b/app/assets/javascripts/admin/templates/user.js.handlebars
@@ -161,10 +161,22 @@
     </div>
 
   </div>
+
   <div class='display-row'>
     <div class='field'>{{i18n trust_level}}</div>
-    <div class='value'>{{trustLevel.name}}</div>
+    <div class="value">
+      {{combobox content=trustLevels value=trustLevel.id }}
+    </div>
+    <div class="controls">
+    {{#if dirty}}
+      <div>
+      <button class='btn ok' {{action saveTrustLevel target="content"}}><i class='icon-ok'></i></button>
+      <button class='btn cancel' {{action restoreTrustLevel target="content"}}><i class='icon-remove'></i></button>
+      </div>
+    {{/if}}
+    </div>
   </div>
+
   <div class='display-row'>
     <div class='field'>{{i18n admin.user.banned}}</div>
     <div class='value'>{{isBanned}}</div>