diff --git a/CHANGELOG b/CHANGELOG
index 8ae223cf..afe79844 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Default parameters work correctly with the generator #2218 [Scott Barron]
+
 * Attempt to require 'rubygems' explicitly when running the switchtower utility #2134
 
 * Make default tasks work only on app/db/web roles, so that additional roles may be created for boxes with specific needs without needing to (for instance) deploy the app to those boxes
diff --git a/lib/switchtower/generators/rails/loader.rb b/lib/switchtower/generators/rails/loader.rb
index 2cbffd43..57abf8b0 100644
--- a/lib/switchtower/generators/rails/loader.rb
+++ b/lib/switchtower/generators/rails/loader.rb
@@ -10,8 +10,8 @@ module SwitchTower
           :switchtower, File.dirname(__FILE__))
 
         args = ["deployment"]
-        args << options[:application] || "Application"
-        args << options[:recipe_file] || "deploy"
+        args << (options[:application] || "Application")
+        args << (options[:recipe_file] || "deploy")
 
         Rails::Generator::Scripts::Generate.new.run(args)
       end