diff --git a/lib/fog/compute/requests/vcloud/login.rb b/lib/fog/compute/requests/vcloud/login.rb
index 651dac262..bea6c1e9e 100644
--- a/lib/fog/compute/requests/vcloud/login.rb
+++ b/lib/fog/compute/requests/vcloud/login.rb
@@ -13,7 +13,7 @@ module Fog
             },
             :method   => 'POST',
             :parse    => true,
-            :uri      => login_uri
+            :uri      => "#{base_url}/login"
           })
         end
 
diff --git a/lib/fog/compute/vcloud.rb b/lib/fog/compute/vcloud.rb
index 33cc85127..b281b0f8d 100644
--- a/lib/fog/compute/vcloud.rb
+++ b/lib/fog/compute/vcloud.rb
@@ -294,7 +294,7 @@ module Fog
         def random_ip
           usable_subnet_ips[rand(usable_subnet_ips.length)]
         end
-        
+
         def usable_subnet_ips
           subnet_ips[3..-2]
         end
@@ -627,7 +627,7 @@ module Fog
         include MockDataClasses
 
         def self.base_url
-          "https://fakey.com/api/v0.8b-ext2.6"
+          "https://fakey.com/api/v1.0"
         end
 
         def self.data_reset
@@ -750,10 +750,12 @@ module Fog
           @connections = {}
           @persistent = options[:persistent]
 
-          @host   = options[:vcloud_host]   || Fog::Vcloud::Compute::HOST
-          @path   = options[:vcloud_path]   || Fog::Vcloud::Compute::PATH
-          @port   = options[:vcloud_port]   || Fog::Vcloud::Compute::PORT
-          @scheme = options[:vcloud_scheme] || Fog::Vcloud::Compute::SCHEME
+          @username = options[:vcloud_username]
+          @password = options[:vcloud_password]
+          @host     = options[:vcloud_host]
+          @path     = options[:vcloud_path]   || Fog::Vcloud::Compute::PATH
+          @port     = options[:vcloud_port]   || Fog::Vcloud::Compute::PORT
+          @scheme   = options[:vcloud_scheme] || Fog::Vcloud::Compute::SCHEME
         end
 
         def default_organization_uri
@@ -806,6 +808,10 @@ module Fog
           do_request(params)
         end
 
+        def base_url
+          "#{@scheme}://#{@host}:#{@port}#{@path}"
+        end
+
         # Use this to set the Authorization header for login
         def authorization_header
           "Basic #{Base64.encode64("#{@username}:#{@password}").chomp!}"