diff --git a/classes/admin.php b/classes/admin.php
index 6809b73d..7fc80826 100644
--- a/classes/admin.php
+++ b/classes/admin.php
@@ -273,6 +273,11 @@ class Admin
                     $obj->merge($post);
                     $obj->file($file);
 
+                    $data[$type] = $obj;
+                } elseif (preg_match('|users/|', $type)) {
+                    $obj = User::load(preg_replace('|users/|', '', $type));
+                    $obj->merge($post);
+
                     $data[$type] = $obj;
                 } else {
                     throw new \RuntimeException("Data type '{$type}' doesn't exist!");
diff --git a/themes/grav/templates/partials/nav.html.twig b/themes/grav/templates/partials/nav.html.twig
index 2645c0e4..f35da397 100644
--- a/themes/grav/templates/partials/nav.html.twig
+++ b/themes/grav/templates/partials/nav.html.twig
@@ -7,7 +7,7 @@
     <div id="admin-user-details">
         <img src="http://www.gravatar.com/avatar/{{ admin.user.email|md5 }}?s=32" />
         <div class="admin-user-names">
-            <h4>{{ admin.user.fullname }}</h4>
+            <h4><a href="{{ base_url_relative }}/users/{{ admin.user.username }}">{{ admin.user.fullname }}</a></h4>
             <h5>{{ admin.user.title }}</h5>
         </div>
     </div>
diff --git a/themes/grav/templates/partials/users-details.html.twig b/themes/grav/templates/partials/users-details.html.twig
new file mode 100644
index 00000000..fbaa9d0b
--- /dev/null
+++ b/themes/grav/templates/partials/users-details.html.twig
@@ -0,0 +1,17 @@
+{% if user.exists %}
+<div class="user-details">
+    <img src="http://www.gravatar.com/avatar/{{ user.email|md5 }}?s=64" />
+    <h1>{{ user.fullname }}{% if user.title %} <small>({{ user.title }})</small>{% endif %}</h1>
+</div>
+{% else %}
+<h1>Create new user</h1>
+{% endif %}
+
+{% include 'partials/blueprints.html.twig' with { data: user, blueprints: user.blueprints } %}
+
+{% if user.exists and admin.user.username != user.username %}
+<div class="button-bar danger">
+    <span class="danger-zone"></span>
+    <a class="button" href="#"><i class="fa fa-fw fa-warning"></i>Remove User</a>
+</div>
+{% endif %}
diff --git a/themes/grav/templates/partials/users-list.html.twig b/themes/grav/templates/partials/users-list.html.twig
new file mode 100644
index 00000000..a4b40b7d
--- /dev/null
+++ b/themes/grav/templates/partials/users-list.html.twig
@@ -0,0 +1,6 @@
+<div class="users card-row grid fixed-blocks pure-g">
+    {% for user in admin.users %}
+        <div class="theme card-item pure-u-1-3">
+        </div>
+    {% endfor %}
+</div>
diff --git a/themes/grav/templates/users.html.twig b/themes/grav/templates/users.html.twig
index 25a632d5..7112e541 100644
--- a/themes/grav/templates/users.html.twig
+++ b/themes/grav/templates/users.html.twig
@@ -1,14 +1,32 @@
 {% extends 'partials/base.html.twig' %}
 
+{% if admin.route %}
+{% set user = admin.data('users/' ~ admin.route) %}
+{% endif %}
+
+{% block titlebar %}
+    {% if not admin.route %}
+        <div class="button-bar">
+            <button class="button" type="submit" name="task" value="add"><i class="fa fa-plus"></i> Add</button>
+        </div>
+        <h1><i class="fa fa-fw fa-child"></i> Users</h1>
+    {% else %}
+        <div class="button-bar">
+            <button class="button" type="submit" name="task" value="save" form="blueprints"><i class="fa fa-check"></i> Save</button>
+        </div>
+        <h1><i class="fa fa-fw fa-user"></i> User: {{ user.username|e }}</h1>
+    {% endif %}
+{% endblock %}
 
 {% block content %}
-
-    <div class="admin-block">
-        <h1>
-            Users
-        </h1>
-
+    <div>
         {% include 'partials/messages.html.twig' %}
+
+        {% if not admin.route %}
+            {%  include 'partials/users-list.html.twig' %}
+        {% else %}
+            {% include 'partials/users-details.html.twig' %}
+        {% endif %}
     </div>
 {% endblock %}