diff --git a/bin/v_change_user_shell b/bin/v_change_user_shell
index 41cfb3b0..55b9f14b 100755
--- a/bin/v_change_user_shell
+++ b/bin/v_change_user_shell
@@ -40,9 +40,6 @@ is_user_suspended
 #                       Action                             #
 #----------------------------------------------------------#
 
-# Changing user shell
-update_user_value "$user" '$SHELL' "$shell"
-
 # Get shell full path
 shell_path=$(/usr/bin/chsh --list-shells | grep -w "$shell" )
 
@@ -50,10 +47,14 @@ shell_path=$(/usr/bin/chsh --list-shells | grep -w "$shell" )
 /usr/bin/chsh -s "$shell_path" "$user" >/dev/null 2>&1
 
 
+
 #----------------------------------------------------------#
 #                       Vesta                              #
 #----------------------------------------------------------#
 
+# Changing user shell
+update_user_value "$user" '$SHELL' "$shell"
+
 # Logging
 log_event 'system' "$V_EVENT"
 
diff --git a/func/shared.func b/func/shared.func
index 168fadc5..d3ff3a66 100644
--- a/func/shared.func
+++ b/func/shared.func
@@ -61,10 +61,10 @@ format_validation() {
 
         # Checking shell
         check_shell=$(/usr/bin/chsh --list-shells | grep -w "$val" )
-        if [ -z "$check_shell" ]; then
+        if [ -z "$1"] || [ -z "$check_shell" ]; then
             echo "Error: shell not found"
-            log_event 'debug' "$E_INVALID $V_EVENT"
-            exit $E_INVALID
+            log_event 'debug' "$E_NOTEXIST $V_EVENT"
+            exit $E_NOTEXIST
         fi
     }