diff --git a/classes/controller.php b/classes/controller.php
index 550eba01..d8cad3df 100644
--- a/classes/controller.php
+++ b/classes/controller.php
@@ -380,7 +380,11 @@ class AdminController
      */
     public function taskContinue()
     {
-        // Only applies to pages.
+        if ($this->view == 'users') {
+            $this->setRedirect("{$this->view}/{$this->post['username']}");
+            return true;
+        }
+
         if ($this->view != 'pages') {
             return false;
         }
diff --git a/themes/grav/templates/partials/blueprints-new.html.twig b/themes/grav/templates/partials/blueprints-new.html.twig
index f05fd841..1659c72c 100644
--- a/themes/grav/templates/partials/blueprints-new.html.twig
+++ b/themes/grav/templates/partials/blueprints-new.html.twig
@@ -1,7 +1,6 @@
 {% set form_id = form_id ? form_id : 'blueprints' %}
 
 <form id="{{ form_id }}" method="post">
-    <h1>New Page</h1>
     {% for field in blueprints.fields %}
         {% if field.type %}
             {% set value = data.value(field.name) %}
diff --git a/themes/grav/templates/users.html.twig b/themes/grav/templates/users.html.twig
index 7112e541..5f686818 100644
--- a/themes/grav/templates/users.html.twig
+++ b/themes/grav/templates/users.html.twig
@@ -7,7 +7,7 @@
 {% 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>
+            <a class="button" href="#modal" data-remodal-target="modal"><i class="fa fa-plus"></i> Add Account</a>
         </div>
         <h1><i class="fa fa-fw fa-child"></i> Users</h1>
     {% else %}
@@ -24,6 +24,11 @@
 
         {% if not admin.route %}
             {%  include 'partials/users-list.html.twig' %}
+
+
+            <div class="remodal" data-remodal-id="modal" data-remodal-options="hashTracking: false">
+                {% include 'partials/blueprints-new.html.twig' with { blueprints: admin.blueprints('user/account_new') } %}
+            </div>
         {% else %}
             {% include 'partials/users-details.html.twig' %}
         {% endif %}