diff --git a/web/templates/admin/add_mail_acc.html b/web/templates/admin/add_mail_acc.html
index 2278f3fb6..af0b8a0ca 100644
--- a/web/templates/admin/add_mail_acc.html
+++ b/web/templates/admin/add_mail_acc.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Adding Mail Domain</b></a>
+                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Adding Mail Account</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
@@ -36,7 +36,7 @@
                                   var rnum = Math.floor(Math.random() * chars.length);
                                   randomstring += chars.substring(rnum,rnum+1);
                                 }
-                                document.v_add_user.v_password.value = randomstring;
+                                document.v_add_mail_acc.v_password.value = randomstring;
                               }
                         </script>
 
diff --git a/web/templates/header.html b/web/templates/header.html
index 275ed541c..df9cd4927 100644
--- a/web/templates/header.html
+++ b/web/templates/header.html
@@ -499,6 +499,10 @@
                 height: 120px;
             }
 
+            .add-textinput:hover {
+                border: 1px solid #e5a907;
+            }
+
             .add-textinput:disabled {
                 background-color: #F1F1F1;
             }
@@ -514,14 +518,24 @@
                 width: 360px;
             }
 
+            .add-input:hover {
+                border: 1px solid #e5a907;
+            }
+
             .add-input:disabled {
-                background-color: #F1F1F1;
+                background-color: #f1f1f1;
             }
 
             .add-list {
                 padding: 4px;
                 font-size: 12pt;
                 color: #555;
+                border-radius: 3px 3px 3px 3px;
+                border: 1px solid #999999;
+            }
+
+            .add-list:hover {
+                border: 1px solid #e5a907;
             }
 
             .add-checkbox {
@@ -529,6 +543,10 @@
                 font-size: 12pt;
             }
 
+            .add-checkbox:hover {
+                border: 1px solid #e5a907;
+            }
+
             button {
                 cursor: pointer;
                 color: #333;