diff --git a/panel/ui/vhost/vhosts.html b/panel/ui/vhost/vhosts.html
index 1fe5e7d..5fff2db 100644
--- a/panel/ui/vhost/vhosts.html
+++ b/panel/ui/vhost/vhosts.html
@@ -1,31 +1,38 @@
 <include href="header.html" />
 
-<table>
-  <tr>
-    <th>Website</th>
-    <th>Username</th>
-    <th>Config</th>
-    <th>Status</th>
-  </tr>
-
-  <repeat group="{{ @vhosts_array }}" value="{{ @vhost_domain }}">
-
+<check if="isset(@vhosts_array)">
+<true>
+  <table>
     <tr>
-      <td><a href="{{@BASE}}/Websites/{{ @vhost_domain.virtualhost  }}">{{ @vhost_domain.virtualhost  }}</a></td>
-      <td>{{ @vhost_domain.username  }}</td>
-      <td>{{ @vhost_domain.config  }}</td>
-      <td>{{ @vhost_domain.status  }}</td>
+      <th>Website</th>
+      <th>Username</th>
+      <th>Config</th>
+      <th>Status</th>
     </tr>
 
-  </repeat>
+    <repeat group="{{ @vhosts_array }}" value="{{ @vhost_domain }}">
 
-</table>
-<p>
-Select a <b>Website</b> name above for more details and options.<br>
-<b>Username</b> is the system username that owns the website files.<br>
-<b>Config</b> is the Apache server Macro Virtualhost config currently set for the site.<br>
-<b>Status</b> can be used to disable a site without deleting any files or other configs.<br>
-</p>
+      <tr>
+        <td><a href="{{@BASE}}/Websites/{{ @vhost_domain.virtualhost  }}">{{ @vhost_domain.virtualhost  }}</a></td>
+        <td>{{ @vhost_domain.username  }}</td>
+        <td>{{ @vhost_domain.config  }}</td>
+        <td>{{ @vhost_domain.status  }}</td>
+      </tr>
+
+    </repeat>
+
+  </table>
+  <p>
+  Select a <b>Website</b> name above for more details and options.<br>
+  <b>Username</b> is the system username that owns the website files.<br>
+  <b>Config</b> is the Apache server Macro Virtualhost config currently set for the site.<br>
+  <b>Status</b> can be used to disable a site without deleting any files or other configs.<br>
+  </p>
+</true>
+<false>
+  <p>There are no website domains on this server.</p>
+</false>
+</check>
 
 <p>
 <a href="#Add_New_Website">Add new Website form</a>
@@ -34,14 +41,14 @@ Select a <b>Website</b> name above for more details and options.<br>
 <hr>
 
 <form action="{{@REALM}}" method="POST">
-<h4  id="Add_New_Website">Add New Website</h4>
+<h4 id="Add_New_Website">Add New Website</h4>
 <fieldset>
   <legend>Only the domain name is required</legend>
   <label for="domain">Domain Name <small>(Do not include 'www', that will be aliased to the main domain)</small></label>
-  <input id="domain" name="domain" type="text" placeholder="example.com" value="{{ @vhost.domain  }}" required>
+  <input id="domain" name="domain" type="text" placeholder="example.com" value="" required>
 
   <label for="username">Username <small>(System username, leave empty for auto-creation)</small></label>
-  <input id="username" name="username" type="text" value="{{ @vhost.username  }}" required>
+  <input id="username" name="username" type="text" placeholder="examplec" value="" required>
 
   Check to jail user: <input type="checkbox" id="jail" name="jail" value="yes" checked>