diff --git a/src/cli/one_helper/oneuser_helper.rb b/src/cli/one_helper/oneuser_helper.rb
index 1ce8cd4b59..adeead6767 100644
--- a/src/cli/one_helper/oneuser_helper.rb
+++ b/src/cli/one_helper/oneuser_helper.rb
@@ -37,7 +37,7 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
                 return -1, "Can not read file: #{arg}"
             end
         else
-            password = arg
+            password = arg.dup
         end
 
         if options[:driver] == OpenNebula::User::X509_AUTH
diff --git a/src/sunstone/models/OpenNebulaJSON/UserJSON.rb b/src/sunstone/models/OpenNebulaJSON/UserJSON.rb
index 0fe15fdcc5..726845d23c 100644
--- a/src/sunstone/models/OpenNebulaJSON/UserJSON.rb
+++ b/src/sunstone/models/OpenNebulaJSON/UserJSON.rb
@@ -26,9 +26,9 @@ module OpenNebulaJSON
                 return user_hash
             end
 
-            password = Digest::SHA1.hexdigest(user_hash['password'])
-
-            self.allocate(user_hash['name'], password, user_hash['auth_driver'])
+            self.allocate(user_hash['name'],
+                          user_hash['password'],
+                          user_hash['auth_driver'])
         end
 
         def perform_action(template_json)
@@ -40,7 +40,7 @@ module OpenNebulaJSON
             rc = case action_hash['perform']
                  when "passwd"       then self.passwd(action_hash['params'])
                  when "chgrp"        then self.chgrp(action_hash['params'])
-                 when "chauth"        then self.chauth(action_hash['params'])
+                 when "chauth"       then self.chauth(action_hash['params'])
                  when "update"       then self.update(action_hash['params'])
                  when "addgroup"     then self.addgroup(action_hash['params'])
                  when "delgroup"     then self.delgroup(action_hash['params'])
@@ -52,8 +52,7 @@ module OpenNebulaJSON
         end
 
         def passwd(params=Hash.new)
-            password = Digest::SHA1.hexdigest(params['password'])
-            super(password)
+            super(params['password'])
         end
 
         def chgrp(params=Hash.new)