diff --git a/app/views/backend/user/edit.volt b/app/views/backend/user/edit.volt
index 7f34a01..d8163aa 100644
--- a/app/views/backend/user/edit.volt
+++ b/app/views/backend/user/edit.volt
@@ -1,17 +1,24 @@
 
-{% if (user.isActive() === false) %}
-    <div class="row">
-        <div class="col-sm-offset-2 col-sm-10">
-            <p class="badge badge-danger">{{ user.getStatus() }}</p>
-        </div>
-    </div>
+<div class="clearfix">
+    <h2 class="pull-left">
+        {% if (user.getId()) %} Edit user #{{ user.getId() }} {% else %} Create user {% endif %}
+    </h2>
+
+{% if (user.getId() and user.isActive() === false) %}
+    <p class="pull-right badge badge-danger">{{ user.getStatus() }}</p>
 {% endif %}
 
+</div>
+
 <form class="form-horizontal" method="post" action="">
 
     <div class="form-group">
+        {% if (form.has('id')) %}
         {{ form.renderDecorated('username', [ 'length': 7 ]) }}
         {{ form.renderDecorated('id', [ 'length': 2, 'label-length' : 1 ]) }}
+        {% else %}
+        {{ form.renderDecorated('username') }}
+        {% endif %}
     </div>
 
     <div class="form-group">
@@ -39,9 +46,14 @@
     <div class="form-group">
         <div class="col-sm-offset-2 col-sm-10">
             <hr />
+            {% if (form.has('Save')) %}
             {{ form.render('Save') }}
+            {% else %}
+            {{ form.render('Create') }}
+            {% endif %}
 
 
+            {% if (user.getId()) %}
             {% set actions = [ 'Activate': 'Active', 'Suspend': 'Suspended', 'Delete': 'Deleted' ] %}
             <div class="pull-right">
                 {% for label, status in actions %}
@@ -55,9 +67,8 @@
 
                 {% endfor %}
             </div>
+            {% endif %}
         </div>
     </div>
 
 </form>
-
-