diff --git a/bin/v-add-database b/bin/v-add-database
index b1887abb..6c6a539f 100755
--- a/bin/v-add-database
+++ b/bin/v-add-database
@@ -32,8 +32,7 @@ source $VESTA/conf/vesta.conf
 
 # Hiding password
 A4='******'
-EVENT="DATE='$DATE' TIME='$TIME' CMD='$SCRIPT' A1='$A1' A2='$A2' A3='$A3'"
-EVENT="$EVENT A4='$A4' A5='$A5' A6='$A6' A7='$A7' A8='$A8' A9='$A9'"
+EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9"
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-add-mail-account b/bin/v-add-mail-account
index 2c0d7ce8..7200a8dc 100755
--- a/bin/v-add-mail-account
+++ b/bin/v-add-mail-account
@@ -25,8 +25,7 @@ source $VESTA/conf/vesta.conf
 
 # Hiding password
 A4='******'
-EVENT="DATE='$DATE' TIME='$TIME' CMD='$SCRIPT' A1='$A1' A2='$A2' A3='$A3'"
-EVENT="$EVENT A4='$A4' A5='$A5' A6='$A6' A7='$A7' A8='$A8' A9='$A9'"
+EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9"
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-add-user b/bin/v-add-user
index 0bda5b0b..aa1c0acc 100755
--- a/bin/v-add-user
+++ b/bin/v-add-user
@@ -23,8 +23,7 @@ source $VESTA/conf/vesta.conf
 
 # Hiding password
 A2='******'
-EVENT="DATE='$DATE' TIME='$TIME' CMD='$SCRIPT' A1='$A1' A2='$A2' A3='$A3'"
-EVENT="$EVENT A4='$A4' A5='$A5' A6='$A6' A7='$A7' A8='$A8' A9='$A9'"
+EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9"
 
 is_user_free() {
     check_sysuser=$(cut -f 1 -d : /etc/passwd | grep -w "$user" )
diff --git a/bin/v-add-web-domain-ftp b/bin/v-add-web-domain-ftp
index 2fe5ba52..d6c3fb45 100755
--- a/bin/v-add-web-domain-ftp
+++ b/bin/v-add-web-domain-ftp
@@ -23,8 +23,8 @@ source $VESTA/conf/vesta.conf
 
 # Hiding password
 A4='******'
-EVENT="DATE='$DATE' TIME='$TIME' CMD='$SCRIPT' A1='$A1' A2='$A2' A3='$A3'"
-EVENT="$EVENT A4='$A4' A5='$A5' A6='$A6' A7='$A7' A8='$A8' A9='$A9'"
+EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9"
+
 
 #----------------------------------------------------------#
 #                    Verifications                         #
diff --git a/bin/v-add-web-domain-stats-user b/bin/v-add-web-domain-stats-user
index b0515c87..423ff713 100755
--- a/bin/v-add-web-domain-stats-user
+++ b/bin/v-add-web-domain-stats-user
@@ -22,8 +22,7 @@ source $VESTA/conf/vesta.conf
 
 # Hiding password
 A4='******'
-EVENT="DATE='$DATE' TIME='$TIME' CMD='$SCRIPT' A1='$A1' A2='$A2' A3='$A3'"
-EVENT="$EVENT A4='$A4' A5='$A5' A6='$A6' A7='$A7' A8='$A8' A9='$A9'"
+EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9"
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-change-database-password b/bin/v-change-database-password
index cabb7770..2272d8f6 100755
--- a/bin/v-change-database-password
+++ b/bin/v-change-database-password
@@ -22,8 +22,7 @@ source $VESTA/conf/vesta.conf
 
 # Hiding password
 A3='******'
-EVENT="DATE='$DATE' TIME='$TIME' CMD='$SCRIPT' A1='$A1' A2='$A2' A3='$A3'"
-EVENT="$EVENT A4='$A4' A5='$A5' A6='$A6' A7='$A7' A8='$A8' A9='$A9'"
+EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9"
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-change-database-user b/bin/v-change-database-user
index e07cf0ca..8b859d23 100755
--- a/bin/v-change-database-user
+++ b/bin/v-change-database-user
@@ -23,8 +23,7 @@ source $VESTA/conf/vesta.conf
 
 # Hiding password
 A4='******'
-EVENT="DATE='$DATE' TIME='$TIME' CMD='$SCRIPT' A1='$A1' A2='$A2' A3='$A3'"
-EVENT="$EVENT A4='$A4' A5='$A5' A6='$A6' A7='$A7' A8='$A8' A9='$A9'"
+EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9"
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-change-mail-account-password b/bin/v-change-mail-account-password
index 8b7b6c6b..85e71cc6 100755
--- a/bin/v-change-mail-account-password
+++ b/bin/v-change-mail-account-password
@@ -24,8 +24,7 @@ source $VESTA/conf/vesta.conf
 
 # Hiding password
 A4='******'
-EVENT="DATE='$DATE' TIME='$TIME' CMD='$SCRIPT' A1='$A1' A2='$A2' A3='$A3'"
-EVENT="$EVENT A4='$A4' A5='$A5' A6='$A6' A7='$A7' A8='$A8' A9='$A9'"
+EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9"
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-change-user-password b/bin/v-change-user-password
index 89c376ad..71332f57 100755
--- a/bin/v-change-user-password
+++ b/bin/v-change-user-password
@@ -19,8 +19,7 @@ source $VESTA/conf/vesta.conf
 
 # Hiding password
 A2="******"
-EVENT="DATE='$DATE' TIME='$TIME' CMD='$SCRIPT' A1='$A1' A2='$A2' A3='$A3'"
-EVENT="$EVENT A4='$A4' A5='$A5' A6='$A6' A7='$A7' A8='$A8' A9='$A9'"
+EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9"
 
 
 #----------------------------------------------------------#
diff --git a/func/main.sh b/func/main.sh
index eadfbb82..87d82653 100644
--- a/func/main.sh
+++ b/func/main.sh
@@ -11,8 +11,7 @@ A6=$6
 A7=$7
 A8=$8
 A9=$9
-EVENT="DATE='$DATE' TIME='$TIME' CMD='$SCRIPT' A1='$A1' A2='$A2' A3='$A3'"
-EVENT="$EVENT A4='$A4' A5='$A5' A6='$A6' A7='$A7' A8='$A8' A9='$A9'"
+EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9"
 HOMEDIR='/home'
 BACKUP='/backup'
 BACKUP_GZIP=5
@@ -52,7 +51,11 @@ E_RESTART=20
 
 # Log event function
 log_event() {
-    echo "RC='$1' $2" >> $VESTA/log/system.log
+    if [ "$1" -eq 0 ]; then
+        echo "$2" >> $VESTA/log/system.log
+    else
+        echo "$2" >> $VESTA/log/error.log
+    fi
 }
 
 # Log user history