diff --git a/cf_remote/commands.py b/cf_remote/commands.py
index 60de028..53ecbc7 100644
--- a/cf_remote/commands.py
+++ b/cf_remote/commands.py
@@ -1071,9 +1071,12 @@ def agent(hosts, bootstrap=None):
         if not data["agent"]:
             raise CFRExitError("CFEngine not installed on {}".format(host))
 
-        command = "{}".format(data["agent"])
+        args = [data["agent"]]
         if bootstrap:
-            command += "--bootstrap {}".format(bootstrap[0])
+            args.append("--bootstrap")
+            args.append(bootstrap[0])
+
+        command = " ".join(args)
 
         output = run_command(host, command, sudo=True)
         if output: