diff --git a/core/client/templates/settings/users/index.hbs b/core/client/templates/settings/users/index.hbs
index 6db4526c8d..f65696a765 100644
--- a/core/client/templates/settings/users/index.hbs
+++ b/core/client/templates/settings/users/index.hbs
@@ -7,47 +7,46 @@
 </header>
 
 <section class="content fade-in settings-users">
-    <section class="object-list">
 
-        <h4 class="object-list-title">Invited users</h4>
+    {{#if invitedUsers}}
 
-        {{#each invitedUsers itemController="settings/users/user"}}
-            <div class="object-list-item">
-                <span class="object-list-item-icon icon-mail">ic</span>
+        <section class="object-list">
 
-                <div class="object-list-item-body">
-                    <span class="name">{{email}}</span><br>
-                    <span class="description">Invitation sent: {{created_at}}</span>
+            <h4 class="object-list-title">Invited users</h4>
+
+            {{#each invitedUsers itemController="settings/users/user"}}
+                <div class="object-list-item">
+                    <span class="object-list-item-icon icon-mail">ic</span>
+
+                    <div class="object-list-item-body">
+                        <span class="name">{{email}}</span><br>
+                        <span class="description">Invitation sent: {{created_at}}</span>
+                    </div>
+                    <aside class="object-list-item-aside">
+                        <a class="object-list-action" href="#" {{action "revoke"}}>Revoke</a>
+                        <a class="object-list-action" href="#" {{action "resend"}}>Resend</a>
+                    </aside>
                 </div>
-                <aside class="object-list-item-aside">
-                    <a class="object-list-action" href="#" {{action "revoke"}}>Revoke</a>
-                    <a class="object-list-action" href="#" {{action "resend"}}>Resend</a>
-                </aside>
-            </div>
-        {{else}}
-            <div class="object-list-item">
-                No invited users.
-            </div>
-        {{/each}}
+            {{/each}}
 
+        </section>
 
-    </section>
+    {{/if}}
 
     <section class="object-list">
 
         <h4 class="object-list-title">Active users</h4>
 
-
         {{#each activeUsers itemController="settings/users/user"}}
-            <div class="object-list-item">
+            {{#link-to 'settings.users.user' slug class="object-list-item" }}
                 <img class="object-list-item-figure"
                      src="{{unbound imageUrl}}"
                      alt="Photo of {{unbound name}}" />
 
                 <div class="object-list-item-body">
-                    {{#link-to 'settings.users.user' slug class="ember-view name" }}
+                    <span class="name">
                         {{user.name}}
-                    {{/link-to}}
+                    </span>
                     <br>
                     <span class="description">Last seen: {{unbound last_login}}</span>
                 </div>
@@ -56,7 +55,7 @@
                     <span class="role-label editor">Editor</span>
                     <span class="role-label owner">Owner</span>
                 </aside>
-            </div>
+            {{/link-to}}
         {{/each}}
 
     </section>
diff --git a/core/client/templates/settings/users/user.hbs b/core/client/templates/settings/users/user.hbs
index 6fac346876..bb8b67b5b8 100644
--- a/core/client/templates/settings/users/user.hbs
+++ b/core/client/templates/settings/users/user.hbs
@@ -1,13 +1,13 @@
 <header class="fade-in user-settings-header">
 
-    <h2 class="title">Your Profile</h2>
+    <h2 class="hidden">Your Profile</h2>
 
     <div class="settings-header-inner">
         <button class="button-back">Back</button>    
     
-        {{!-- <section class="page-actions page-actions-alt">
-            <button class="button has-icon users-back"><i class="icon-chevron-left"></i>Users</button>
-        </section> --}}
+        <section class="page-actions page-actions-alt">
+            {{#link-to "settings.users" class="button has-icon users-back" tagName="button"}}<i class="icon-chevron-left"></i>Users{{/link-to}}
+        </section>
 
         <section class="page-actions">
                     
@@ -29,7 +29,6 @@
 
     <header class="user-profile-header">
         <img id="user-cover" class="cover-image" {{bind-attr src=cover title=coverTitle}} />
-
         <a class="edit-cover-image js-modal-cover button" {{action "openModal" "upload" user "cover"}}>Change Cover</a>
     </header>
 
@@ -64,12 +63,19 @@
                 <p>Used for notifications</p>
             </div>
 
+            {{!-- The correct markup for select boxes. Needs changing to the correct data --}}
             {{!-- <div class="form-group">
                 <label for="user-role">Role</label>
-                <select id="user-role">
-                    <option value="#">Author</option>
-                    <option value="#">Admin</option>
-                </select>
+                <span class="gh-select" {{bind-attr data-select-text=selectedTheme.label}}>
+                   {{view Ember.Select
+                       id="activeTheme"
+                       name="general[activeTheme]"
+                       content=themes
+                       optionValuePath="content.name"
+                       optionLabelPath="content.label"
+                       value=activeTheme
+                       selection=selectedTheme}}
+               </span>
                 <p>What permissions should this user have?</p>
             </div> --}}