diff --git a/src/client/ruby/oneuser b/src/client/ruby/oneuser
index 26be8f6dbe..691b0ad121 100755
--- a/src/client/ruby/oneuser
+++ b/src/client/ruby/oneuser
@@ -168,6 +168,21 @@ when "create"
 when "delete"
     check_parameters("delete", 1)
     user_id=get_user_id(ARGV[0])
+
+    # Check if the user has defined VM's
+    vms=false
+    vmpool=OpenNebula::VirtualMachinePool.new(
+        get_one_client, user_id)
+    vmpool.info
+    vmpool.each{ vms=true ; break }
+
+    if vms
+        puts "The user still has VM's defined, type YES if you are sure you"
+        print "want to delete this user: "
+        answer=STDIN.gets.strip
+        exit -1 if answer != 'YES'
+    end
+
     user=OpenNebula::User.new(
         OpenNebula::User.build_xml(user_id), get_one_client)
     result=user.delete