diff --git a/bin/v-add-database b/bin/v-add-database
index 9d036884a..371a2f54e 100755
--- a/bin/v-add-database
+++ b/bin/v-add-database
@@ -48,8 +48,8 @@ is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_object_new 'db' 'DB' "$database"
 get_next_dbhost
-is_object_valid "../../../conf/$type" 'HOST' "$host"
-is_object_unsuspended "../../../conf/$type" 'HOST' "$host"
+is_object_valid "../../../conf/$type" 'DBHOST' "$host"
+is_object_unsuspended "../../../conf/$type" 'DBHOST' "$host"
 #is_charset_valid
 is_package_full 'DATABASES'
 
diff --git a/web/templates/admin/list_db.html b/web/templates/admin/list_db.html
index b947c5338..4fd7cb5cd 100644
--- a/web/templates/admin/list_db.html
+++ b/web/templates/admin/list_db.html
@@ -43,9 +43,9 @@
                                     }
                                     if ($data[$key]['HOST'] != 'localhost' ) $http_host = $data[$key]['HOST'];
                                     if ($data[$key]['TYPE'] == 'mysql') $db_admin = "phpMyAdmin";
-                                    if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "http://".$http_host."/phpMyAdmin/";
+                                    if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "https://".$http_host."/phpMyAdmin/";
                                     if ($data[$key]['TYPE'] == 'pgsql') $db_admin = "phpPgAdmin";
-                                    if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "http://".$http_host."/phpPgAdmin/";
+                                    if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "https://".$http_host."/phpPgAdmin/";
                             ?> 
                             <tr class="data-row">
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
diff --git a/web/templates/admin/list_mail.html b/web/templates/admin/list_mail.html
index 8e6aa9f57..f68f14c81 100644
--- a/web/templates/admin/list_mail.html
+++ b/web/templates/admin/list_mail.html
@@ -79,7 +79,7 @@
                                             <?php print _('edit');?> 
                                         </span>
                                     </a>
-                                    <a href="<?php echo "http://".$http_host."/webmail/"; ?>" target="_blank" class="data-controls">
+                                    <a href="<?php echo "https://".$http_host."/webmail/"; ?>" target="_blank" class="data-controls">
                                         <span>
                                             <img src="/images/new_window.png" width="8px" height="8px">
                                             <?php print _('open webmail');?> 
diff --git a/web/templates/admin/list_web.html b/web/templates/admin/list_web.html
index 5990e870f..94b0686f3 100644
--- a/web/templates/admin/list_web.html
+++ b/web/templates/admin/list_web.html
@@ -110,7 +110,7 @@
                                     <?php
                                         if (!empty($data[$key]['STATS'])) {
                                     ?> 
-                                    <a href="http://<?php echo $key ?>/vstats/"  target="_blank" class="data-controls">
+                                    <a href="https://<?php echo $key ?>/vstats/"  target="_blank" class="data-controls">
                                         <span>
                                             <img src="/images/new_window.png" width="8px" height="8px">
                                             <?php print _('open webstats');?> 
diff --git a/web/templates/user/list_db.html b/web/templates/user/list_db.html
index 216f8615c..6744b0cd4 100644
--- a/web/templates/user/list_db.html
+++ b/web/templates/user/list_db.html
@@ -41,9 +41,9 @@
                                     }
                                     if ($data[$key]['HOST'] != 'localhost' ) $http_host = $data[$key]['HOST'];
                                     if ($data[$key]['TYPE'] == 'mysql') $db_admin = "phpMyAdmin";
-                                    if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "http://".$http_host."/phpMyAdmin/";
+                                    if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "https://".$http_host."/phpMyAdmin/";
                                     if ($data[$key]['TYPE'] == 'pgsql') $db_admin = "phpPgAdmin";
-                                    if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "http://".$http_host."/phpPgAdmin/";
+                                    if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "https://".$http_host."/phpPgAdmin/";
                             ?> 
                             <tr class="data-row">
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
diff --git a/web/templates/user/list_mail.html b/web/templates/user/list_mail.html
index 725379762..8257202a6 100644
--- a/web/templates/user/list_mail.html
+++ b/web/templates/user/list_mail.html
@@ -68,7 +68,7 @@
                                             <?php print _('edit');?> 
                                         </span>
                                     </a>
-                                    <a href="<?php echo "http://".$http_host."/webmail/"; ?>" target="_blank" class="data-controls">
+                                    <a href="<?php echo "https://".$http_host."/webmail/"; ?>" target="_blank" class="data-controls">
                                         <span>
                                             <img src="/images/new_window.png" width="8px" height="8px">
                                             <?php print _('open webmail');?> 
diff --git a/web/templates/user/list_web.html b/web/templates/user/list_web.html
index de4548f4f..04dbf77b8 100644
--- a/web/templates/user/list_web.html
+++ b/web/templates/user/list_web.html
@@ -99,7 +99,7 @@
                                     <?php
                                         if (!empty($data[$key]['STATS'])) {
                                     ?> 
-                                    <a href="http://<?php echo $key ?>/vstats/"  target="_blank" class="data-controls">
+                                    <a href="https://<?php echo $key ?>/vstats/"  target="_blank" class="data-controls">
                                         <span>
                                             <img src="/images/new_window.png" width="8px" height="8px">
                                             <?php print _('open webstats');?>