diff --git a/ui/daignostics.go b/ui/daignostics.go
index 31f68250..8adb7cc8 100644
--- a/ui/daignostics.go
+++ b/ui/daignostics.go
@@ -151,12 +151,16 @@ func aclsTest(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	acl := data.GetEffectiveAcl(username)
-	b, _ := json.MarshalIndent(acl, "", "    ")
+	acl := ""
+	if username != "" {
+		b, _ := json.MarshalIndent(data.GetEffectiveAcl(username), "", "    ")
+		acl = string(b)
+	}
 
 	d := struct {
 		Page
 		AclString string
+		Username  string
 	}{
 		Page: Page{
 
@@ -167,7 +171,8 @@ func aclsTest(w http.ResponseWriter, r *http.Request) {
 			ServerID:     serverID,
 			ClusterState: clusterState,
 		},
-		AclString: string(b),
+		AclString: acl,
+		Username:  username,
 	}
 
 	renderDefaults(w, r, d, "diagnostics/acl_tester.html")
diff --git a/ui/templates/diagnostics/acl_tester.html b/ui/templates/diagnostics/acl_tester.html
index 7513b35f..cbce0001 100644
--- a/ui/templates/diagnostics/acl_tester.html
+++ b/ui/templates/diagnostics/acl_tester.html
@@ -9,15 +9,24 @@ <h1 class="m-0 text-gray-900">User ACL</h6>
             </p>
     </div>
     <div class="card-body">
-        <form action="/diag/acls" method="POST">
-            {{ csrfToken }}
-            <div class="form-row">
-                <div class="form-group">
-                    <input type="text" class="form-control" name="username" id="username" placeholder="username">
-                </div>
-                <button type="submit" class="btn btn-primary">Check</button>
-        </form>
-        <pre>{{.AclString}}</pre>
+        <div class="row">
+            <div class="col">
+                <form class="form-inline" action="/diag/acls" method="POST">
+                    {{ csrfToken }}
+                    <div class="form-group mx-sm-3 mb-2">
+                        <label for="username" class="sr-only">Username</label>
+                        <input type="text" class="form-control" id="username" name="username" value="{{.Username}}"
+                            placeholder="Username">
+                    </div>
+                    <button type="submit" class="btn btn-primary mb-2">Check</button>
+                </form>
+            </div>
+        </div>
+        <div class="row mt-4 ml-2">
+            <div class="col">
+                <pre>{{.AclString}}</pre>
+            </div>
+        </div>
     </div>
 </div>
 
diff --git a/ui/templates/menus.html b/ui/templates/menus.html
index 73baa83b..4a392d5a 100755
--- a/ui/templates/menus.html
+++ b/ui/templates/menus.html
@@ -166,6 +166,7 @@
                         <h6 class="collapse-header">Tools:</h6>
                         <a class="collapse-item" href="/diag/firewall">Firewall State</a>
                         <a class="collapse-item" href="/diag/wg">Wireguard Peers</a>
+                        <a class="collapse-item" href="/diag/acls">ACL Tester</a>
                     </div>
                 </div>
             </li>