diff --git a/web/api/v1/add/mail/index.php b/web/api/v1/add/mail/index.php
index 8f5899587..428cbb1bd 100644
--- a/web/api/v1/add/mail/index.php
+++ b/web/api/v1/add/mail/index.php
@@ -172,6 +172,7 @@ if (!empty($_POST['ok_acc'])) {
         if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
     }
 
+
     // Email login credentials
     if ((!empty($v_send_email)) && (empty($_SESSION['error_msg']))) {
         $to = $v_send_email;
diff --git a/web/api/v1/edit/package/index.php b/web/api/v1/edit/package/index.php
index c16ef4bdb..d890fa511 100644
--- a/web/api/v1/edit/package/index.php
+++ b/web/api/v1/edit/package/index.php
@@ -260,7 +260,9 @@ $result = array(
     'web_system' => $_SESSION['WEB_SYSTEM'],
     'web_backend' => $_SESSION['WEB_BACKEND'],
     'proxy_system' => $_SESSION['PROXY_SYSTEM'],
-    'dns_system' => $_SESSION['DNS_SYSTEM']
+    'dns_system' => $_SESSION['DNS_SYSTEM'],
+    'error_msg' => $_SESSION['error_msg'],
+    'ok_msg' => $_SESSION['ok_msg']
 );
 
 echo json_encode($result);
diff --git a/web/api/v1/edit/server/test.php b/web/api/v1/edit/server/test.php
new file mode 100644
index 000000000..a76682b4a
--- /dev/null
+++ b/web/api/v1/edit/server/test.php
@@ -0,0 +1,18 @@
+<?php
+error_reporting(NULL);
+$TAB = 'SERVER';
+
+header('Content-Type: application/json');
+
+// Main include
+include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
+
+// Change port
+exec (VESTA_CMD."v-change-vesta-port ".escapeshellarg('8087'), $output, $return_var);
+check_return_code($return_var,$output);
+unset($output);
+
+header('Location: '
+    . ($_SERVER['HTTPS'] ? 'https' : 'http')
+    . '://' . $_SERVER['HTTP_HOST'] . ':' . '8087');
+exit;
diff --git a/web/api/v1/list/mail/index.php b/web/api/v1/list/mail/index.php
index abc6f47df..11dfbbaec 100644
--- a/web/api/v1/list/mail/index.php
+++ b/web/api/v1/list/mail/index.php
@@ -60,15 +60,23 @@ foreach ($data as $key => $value) {
   }
 
   if (empty($_GET['domain'])){
-  	$total_amount = $i === 1 ? __('1 domain') : __('%s domains', $i);
+  	$total_amount = $i == 1 ? __('1 domain') : __('%s domains', $i);
   } else {
-  	$total_amount = $i === 1 ?  __('1 mail account') : __('%s mail account', $i);
+  	$total_amount = $i == 1 ?  __('1 mail account') : __('%s mail account', $i);
   }
 
   $data[$key]['list_accounts_button'] = __('list accounts', $data[$key]['ACCOUNTS']);
   $data[$key]['delete_conf'] = __('DELETE_DOMAIN_CONFIRMATION', $key);
 }
 
+if (count($data) == 0) {
+  if (empty($_GET['domain'])){
+    $total_amount = __('%s domains', 0);
+  } else {
+    $total_amount = __('%s mail account', 0);
+  }
+}
+
 // Back uri
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
 
diff --git a/web/api/v1/list/server/index.php b/web/api/v1/list/server/index.php
index 47363fcae..dd2cabace 100644
--- a/web/api/v1/list/server/index.php
+++ b/web/api/v1/list/server/index.php
@@ -17,57 +17,52 @@ if ($_SESSION['user'] != 'admin') {
 if (isset($_GET['cpu'])) {
     $TAB = 'CPU';
     exec (VESTA_CMD.'v-list-sys-cpu-status', $output, $return_var);
-    $service_log = $output;
 }
 
 // Memory info
 if (isset($_GET['mem'])) {
     $TAB = 'MEMORY';
     exec (VESTA_CMD.'v-list-sys-memory-status', $output, $return_var);
-    $service_log = $output;
 }
 
 // Disk info
 if (isset($_GET['disk'])) {
     $TAB = 'DISK';
     exec (VESTA_CMD.'v-list-sys-disk-status', $output, $return_var);
-    $service_log = $output;
 }
 
 // Network info
 if (isset($_GET['net'])) {
     $TAB = 'NETWORK';
     exec (VESTA_CMD.'v-list-sys-network-status', $output, $return_var);
-    $service_log = $output;
 }
 
 // Web info
 if (isset($_GET['web'])) {
     $TAB = 'WEB';
     exec (VESTA_CMD.'v-list-sys-web-status', $output, $return_var);
-    $service_log = $output;
 }
 
-
 // DNS info
 if (isset($_GET['dns'])) {
     $TAB = 'DNS';
     exec (VESTA_CMD.'v-list-sys-dns-status', $output, $return_var);
-    $service_log = $output;
 }
 
 // Mail info
 if (isset($_GET['mail'])) {
     $TAB = 'MAIL';
     exec (VESTA_CMD.'v-list-sys-mail-status', $output, $return_var);
-    $service_log = $output;
 }
 
 // DB info
 if (isset($_GET['db'])) {
     $TAB = 'DB';
     exec (VESTA_CMD.'v-list-sys-db-status', $output, $return_var);
-    $service_log = $output;
+}
+
+foreach($output as $file) {
+    $service_log .= $file . "\n";
 }
 
 // Data
diff --git a/web/api/v1/list/user/index.php b/web/api/v1/list/user/index.php
index 66681de45..01a1fe6c0 100644
--- a/web/api/v1/list/user/index.php
+++ b/web/api/v1/list/user/index.php
@@ -31,23 +31,23 @@ foreach ($data as $key => $value) {
   $data[$key]['U_BANDWIDTH_PERCENT'] = get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']);
   $data[$key]['U_DISK_PERCENT'] = get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']);
 
+  $data[$key]['U_BANDWIDTH_MEASURE'] = humanize_usage_measure($data[$key]['U_BANDWIDTH']);
   $data[$key]['U_BANDWIDTH'] = humanize_usage_size($data[$key]['U_BANDWIDTH']);
-  $data[$key]['U_BANDWIDTH_MEASURE'] = humanize_usage_measure($data[$key]['U_BANDWIDTH_MEASURE']);
 
+  $data[$key]['U_DISK_MEASURE'] = humanize_usage_measure($data[$key]['U_DISK']);
   $data[$key]['U_DISK'] = humanize_usage_size($data[$key]['U_DISK']);
-  $data[$key]['U_DISK_MEASURE'] = humanize_usage_measure($data[$key]['U_DISK_MEASURE']);
 
+  $data[$key]['U_DISK_WEB_MEASURE'] = humanize_usage_measure($data[$key]['U_DISK_WEB']);
   $data[$key]['U_DISK_WEB'] = humanize_usage_size($data[$key]['U_DISK_WEB']);
-  $data[$key]['U_DISK_WEB_MEASURE'] = humanize_usage_measure($data[$key]['U_DISK_WEB_MEASURE']);
 
+  $data[$key]['U_DISK_DB_MEASURE'] = humanize_usage_measure($data[$key]['U_DISK_DB']);
   $data[$key]['U_DISK_DB'] = humanize_usage_size($data[$key]['U_DISK_DB']);
-  $data[$key]['U_DISK_DB_MEASURE'] = humanize_usage_measure($data[$key]['U_DISK_DB_MEASURE']);
 
+  $data[$key]['U_DISK_MAIL_MEASURE'] = humanize_usage_measure($data[$key]['U_DISK_MAIL']);
   $data[$key]['U_DISK_MAIL'] = humanize_usage_size($data[$key]['U_DISK_MAIL']);
-  $data[$key]['U_DISK_MAIL_MEASURE'] = humanize_usage_measure($data[$key]['U_DISK_MAIL_MEASURE']);
 
+  $data[$key]['U_DISK_DIRS_MEASURE'] = humanize_usage_measure($data[$key]['U_DISK_DIRS']);
   $data[$key]['U_DISK_DIRS'] = humanize_usage_size($data[$key]['U_DISK_DIRS']);
-  $data[$key]['U_DISK_DIRS_MEASURE'] = humanize_usage_measure($data[$key]['U_DISK_DIRS_MEASURE']);
   
   if ($data[$key]['SUSPENDED'] == 'yes') {
     $spnd_action = 'unsuspend' ;
diff --git a/web/api/v1/list/web-log/index.php b/web/api/v1/list/web-log/index.php
index 4f6823636..055717a69 100644
--- a/web/api/v1/list/web-log/index.php
+++ b/web/api/v1/list/web-log/index.php
@@ -14,10 +14,18 @@ if ($_GET['type'] == 'access') $type = 'access';
 if ($_GET['type'] == 'error') $type = 'error';
 
 $data = exec (VESTA_CMD."v-list-web-domain-".$type."log $user ".$v_domain, $output, $return_var);
+$content = '';
+
+if ($return_var == 0 ) {
+	foreach($output as $file) {
+			$content .= htmlentities($file) . "\n";
+	}
+}
 
 echo json_encode(
 	array(
-		'data' => $data
+		'data' => $content,
+		'prefix' => __('Last 70 lines of %s.%s.log', htmlentities($_GET['domain']), htmlentities($_GET['type']))
 	)
 );
 
diff --git a/web/api/v1/login/index.php b/web/api/v1/login/index.php
index 114a1fd97..398f6d2b2 100644
--- a/web/api/v1/login/index.php
+++ b/web/api/v1/login/index.php
@@ -148,20 +148,22 @@ if (empty($_SESSION['language'])) {
     }
 }
 
-// Generate CSRF token
-$token = bin2hex(file_get_contents('/dev/urandom', false, null, 0, 16));
-$_SESSION['token'] = $token;
+if (empty($_SESSION['token'])) {
+    // Generate CSRF token
+    $token = bin2hex(file_get_contents('/dev/urandom', false, null, 0, 16));
+    $_SESSION['token'] = $token;
+}
 
 require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n/'.$_SESSION['language'].'.php');
 
 $v_user = empty($_SESSION['look']) ? $_SESSION['user'] : $_SESSION['look'];
 top_panel($v_user, $TAB);
 
+$panel[$v_user]['U_BANDWIDTH_MEASURE'] = humanize_usage_measure($panel[$v_user]['U_BANDWIDTH']);
 $panel[$v_user]['U_BANDWIDTH'] = humanize_usage_size($panel[$v_user]['U_BANDWIDTH']);
-$panel[$v_user]['U_BANDWIDTH_MEASURE'] = humanize_usage_measure($panel[$v_user]['U_BANDWIDTH_MEASURE']);
 
+$panel[$v_user]['U_DISK_MEASURE'] = humanize_usage_measure($panel[$v_user]['U_DISK']);
 $panel[$v_user]['U_DISK'] = humanize_usage_size($panel[$v_user]['U_DISK']);
-$panel[$v_user]['U_DISK_MEASURE'] = humanize_usage_measure($panel[$v_user]['U_DISK_MEASURE']);
 
 $result = array(
     'token' => $_SESSION['token'],