diff --git a/bin/v-delete-user b/bin/v-delete-user
index d05cc7d9..07efd749 100755
--- a/bin/v-delete-user
+++ b/bin/v-delete-user
@@ -89,8 +89,14 @@ fi
 sed -i "/ $user$/d" $VESTA/data/queue/disk.pipe
 sed -i "/ $user$/d" $VESTA/data/queue/traffic.pipe
 
-# Removing system user
-/usr/sbin/userdel -f $user
+# Deleting system user
+/usr/sbin/userdel -f $user >> /dev/null 2>&1
+if [ "$?" != 0 ]; then
+    sed -i "/^$user:/d" /etc/passwd
+    sed -i "/^$user:/d" /etc/shadow
+fi
+
+# Deleting user directories
 chattr -i $HOMEDIR/$user/conf
 rm -rf $HOMEDIR/$user
 rm -f /var/spool/mail/$user