diff --git a/source/lib/vagrant-openstack-provider/action/connect_openstack.rb b/source/lib/vagrant-openstack-provider/action/connect_openstack.rb
index d647979..dd7eb11 100644
--- a/source/lib/vagrant-openstack-provider/action/connect_openstack.rb
+++ b/source/lib/vagrant-openstack-provider/action/connect_openstack.rb
@@ -25,7 +25,7 @@ def call(env)
             override_endpoint_catalog_with_user_config(env)
             log_endpoint_catalog(env)
           end
-          @app.call(env)
+          @app.call(env) unless @app.nil?
         end
 
         private
diff --git a/source/lib/vagrant-openstack-provider/command/abstract_command.rb b/source/lib/vagrant-openstack-provider/command/abstract_command.rb
index aa77ddf..667deea 100644
--- a/source/lib/vagrant-openstack-provider/command/abstract_command.rb
+++ b/source/lib/vagrant-openstack-provider/command/abstract_command.rb
@@ -16,9 +16,7 @@ def execute(name)
             env[:ui] = @env.ui
           end
 
-          client = VagrantPlugins::Openstack
-          client.keystone.authenticate(env)
-          env[:openstack_client] = client
+          VagrantPlugins::Openstack::Action::ConnectOpenstack.new(nil, env).call(env)
 
           cmd(name, @argv, env)
         end