diff --git a/create/views.py b/create/views.py
index 877eb6f..5b03f8c 100644
--- a/create/views.py
+++ b/create/views.py
@@ -48,10 +48,10 @@ def create_instance(request, compute_id):
 
     if conn:
         if not storages:
-            msg = _("You haven't defined have any storage pools")
+            msg = _("You haven't defined any storage pools")
             error_messages.append(msg)
         if not networks:
-            msg = _("You haven't defined have any network pools")
+            msg = _("You haven't defined any network pools")
             error_messages.append(msg)
 
         if request.method == 'POST':
diff --git a/instances/templates/create_inst_block.html b/instances/templates/create_inst_block.html
index 63fcc35..36ec37d 100644
--- a/instances/templates/create_inst_block.html
+++ b/instances/templates/create_inst_block.html
@@ -18,9 +18,13 @@
                             <label class="col-sm-4 control-label">{% trans "Compute" %}</label>
                             <div class="col-sm-6">
                                 <select class="form-control" id="compute_select">
-                                    {% for compute in computes %}
-                                        <option value="{{ compute.id }}">{{ compute.name }}</option>
-                                    {% endfor %}
+                                    {% if computes %}
+                                        {% for compute in computes %}
+                                            <option value="{{ compute.id }}">{{ compute.name }}</option>
+                                        {% endfor %}
+                                    {% else %}
+                                        <option value="None">{% trans "None" %}</option>
+                                    {% endif %}
                                 </select>
                             </div>
                         </div>
@@ -30,9 +34,15 @@
                     <button type="button" class="btn btn-default" data-dismiss="modal">
                         {% trans "Close" %}
                     </button>
-                    <button type="submit" class="btn btn-primary" name="chose" onclick='goto_compute()'>
-                        {% trans "Chose" %}
-                    </button>
+                    {% if computes %}
+                        <button type="submit" class="btn btn-primary" name="chose" onclick='goto_compute()'>
+                            {% trans "Chose" %}
+                        </button>
+                    {% else %}
+                        <button class="btn btn-primary disabled">
+                            {% trans "Chose" %}
+                        </button>
+                    {% endif %}
                 </div>
             </div> <!-- /.modal-content -->
         </div> <!-- /.modal-dialog -->
diff --git a/instances/templates/instances.html b/instances/templates/instances.html
index c707c35..3eceedb 100644
--- a/instances/templates/instances.html
+++ b/instances/templates/instances.html
@@ -9,6 +9,9 @@
                 <!-- Page Heading -->
                 <div class="row">
                     <div class="col-lg-12">
+                        {% if request.user.is_superuser %}
+                            {% include 'create_inst_block.html' %}
+                        {% endif %}
                         {% if all_host_vms %}
                             {% include 'create_inst_block.html' %}
                             <div class="pull-right search">