diff --git a/src/cloud/common/CloudAuth.rb b/src/cloud/common/CloudAuth.rb
index cbc0e5bd49..d46f4ee45f 100644
--- a/src/cloud/common/CloudAuth.rb
+++ b/src/cloud/common/CloudAuth.rb
@@ -104,7 +104,7 @@ class CloudAuth
 
         token = @server_auth.login_token(expiration_time,username)
 
-        if endpoint
+        if endpoint and endpoint != "-"
             return OpenNebula::Client.new(token,endpoint)
         else
             return OpenNebula::Client.new(token,@conf[:one_xmlrpc])