diff --git a/lib/dpl/providers/bluemixcloudfoundry.rb b/lib/dpl/providers/bluemixcloudfoundry.rb
index b365c7e30..5f202db16 100644
--- a/lib/dpl/providers/bluemixcloudfoundry.rb
+++ b/lib/dpl/providers/bluemixcloudfoundry.rb
@@ -34,8 +34,8 @@ class Bluemixcloudfoundry < Provider
 
       cmds install: 'test $(uname) = "Linux" && rel="linux64-binary" || rel="macosx64"; wget "https://cli.run.pivotal.io/stable?release=${rel}&source=github" -qO cf.tgz && tar -zxvf cf.tgz && rm cf.tgz',
            api:     './cf api %{api} %{skip_ssl_validation_opt}',
-           login:   './cf login -u %{username} -p %{password}',
-           target:  './cf target -o %{organization} -s %{space}',
+           login:   './cf login -u %{username} -p %{password} -o "%{organization}" -s "%{space}"',
+           target:  './cf target -o "%{organization}" -s "%{space}"',
            push:    './cf push %{push_args}',
            logout:  './cf logout'
 
diff --git a/spec/dpl/providers/bluemixcloudfoundry_spec.rb b/spec/dpl/providers/bluemixcloudfoundry_spec.rb
index b24fc3548..c7deb7a8c 100644
--- a/spec/dpl/providers/bluemixcloudfoundry_spec.rb
+++ b/spec/dpl/providers/bluemixcloudfoundry_spec.rb
@@ -9,8 +9,8 @@
   describe 'by default', record: true do
     it { should have_run %r(wget .*cli.run.pivotal.io.* -qO cf.tgz && tar -zxvf cf.tgz) }
     it { should have_run './cf api api.ng.bluemix.net' }
-    it { should have_run './cf login -u name -p pass' }
-    it { should have_run './cf target -o org -s space' }
+    it { should have_run './cf login -u name -p pass -o "org" -s "space"' }
+    it { should have_run './cf target -o "org" -s "space"' }
     it { should have_run './cf push' }
     it { should have_run './cf logout' }
     it { should have_run_in_order }