diff --git a/src/cli/one_helper/oneuser_helper.rb b/src/cli/one_helper/oneuser_helper.rb
index de35dd61d6..d8e0f5287b 100644
--- a/src/cli/one_helper/oneuser_helper.rb
+++ b/src/cli/one_helper/oneuser_helper.rb
@@ -443,7 +443,7 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
         rc   = user.info
         if OpenNebula.is_error?(rc)
             puts rc.message
-            exit_with_code 1, rc.message
+            exit 1
         end
         user
     end
diff --git a/src/cli/oneuser b/src/cli/oneuser
index 7b7b3c815c..81f8c053f3 100755
--- a/src/cli/oneuser
+++ b/src/cli/oneuser
@@ -40,7 +40,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     helper = OneUserHelper.new
 
     before_proc do
-        helper.set_client(options) if ![:login, :key].include?(@comm_name)
+        helper.set_client(options) if ![:key].include?(@comm_name)
     end
 
     ########################################################################