diff --git a/core/client/models/user.js b/core/client/models/user.js
index 59f430b3e9..8e6e78459d 100644
--- a/core/client/models/user.js
+++ b/core/client/models/user.js
@@ -32,6 +32,12 @@ var User = DS.Model.extend(NProgressSaveMixin, ValidationEngine, {
         return this.get('roles').objectAt(0).get('name').toLowerCase() === 'author';
     }),
 
+    // TODO: Once client-side permissions are in place,
+    // remove the hard role check.
+    isEditor: Ember.computed('roles', function () {
+        return this.get('roles').objectAt(0).get('name').toLowerCase() === 'editor';
+    }),
+
     saveNewPassword: function () {
         var url = this.get('ghostPaths.url').api('users', 'password');
         return ic.ajax.request(url, {
diff --git a/core/client/templates/settings.hbs b/core/client/templates/settings.hbs
index 3c2ec2a5b4..84eb0c3082 100644
--- a/core/client/templates/settings.hbs
+++ b/core/client/templates/settings.hbs
@@ -4,11 +4,19 @@
     </header>
     <nav class="settings-menu">
         <ul>
-	    {{gh-activating-list-item route="settings.general" title="General" classNames="general"}}
-	    {{gh-activating-list-item route="settings.users" title="Users" classNames="users"}}
-            {{#if showApps}}
-	    {{gh-activating-list-item route="settings.apps" title="Apps" classNames="apps"}}
-            {{/if}}
+            {{#unless session.user.isAuthor}}
+                {{#unless session.user.isEditor}}
+                    {{gh-activating-list-item route="settings.general" title="General" classNames="general"}}
+                {{/unless}}
+
+                {{gh-activating-list-item route="settings.users" title="Users" classNames="users"}}
+
+                {{#if showApps}}
+                    {{#unless session.user.isEditor}}
+                        {{gh-activating-list-item route="settings.apps" title="Apps" classNames="apps"}}
+                    {{/unless}}
+                {{/if}}
+            {{/unless}}
         </ul>
     </nav>
 </aside>