diff --git a/burpui/static/dashboard.css b/burpui/static/dashboard.css
index dd73a433..f7385f86 100644
--- a/burpui/static/dashboard.css
+++ b/burpui/static/dashboard.css
@@ -7,6 +7,9 @@ body {
   padding-top: 50px;
 }
 
+.form-control {
+  border: 1px solid #cccccc;
+}
 
 /*
  * Global add-ons
diff --git a/burpui/templates/client-browse.html b/burpui/templates/client-browse.html
index f7697f22..d6d9a7a0 100644
--- a/burpui/templates/client-browse.html
+++ b/burpui/templates/client-browse.html
@@ -90,10 +90,10 @@
                 </div>
               </div>
             </form>
-            <form id="form-server-initiated" class="form-inline col-md-6 text-right" method="POST" role="form" action"{{ url_for('api.server_restore', name=cname, backup=nbackup, server=server) }}" ng-show="sc_restore.enabled">
+            <form id="form-server-initiated" class="form-inline col-md-6 text-right" method="POST" role="form" action"{{ url_for('api.server_restore', name=cname, backup=nbackup, server=server) }}">
               <input type="hidden" name="list-sc">
               <div id="server-initiated-form" style="display:none;">
-                <div class="btn-group dropup">
+                <div class="btn-group dropup" ng-show="sc_restore.enabled">
                   <button type="submit" class="btn btn-info" id="perform-server-initiated"><span class="glyphicon glyphicon-cloud-upload"></span>&nbsp;Server initiated restore</button>
                   <button class="btn btn-info dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
                   <ul class="dropdown-menu dropdown-menu-right browse">
@@ -112,7 +112,7 @@
                   </ul>
                 </div>
                 {% if edit -%}
-                <button type="button" id="btn-cancel-restore" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span>&nbsp;Cancel restore</button>
+                <button type="button" id="btn-cancel-restore" class="btn btn-danger" ng-show="sc_restore.enabled"><span class="glyphicon glyphicon-trash"></span>&nbsp;Cancel restore</button>
                 {% endif -%}
                 <button type="button" id="btn-clear" class="btn btn-info"><span class="glyphicon glyphicon-trash"></span>&nbsp;Clear selection</button>
               </div>