diff --git a/cake/console/templates/default/classes/controller.ctp b/cake/console/templates/default/classes/controller.ctp
index 392a73851..48d7b1b1c 100644
--- a/cake/console/templates/default/classes/controller.ctp
+++ b/cake/console/templates/default/classes/controller.ctp
@@ -29,13 +29,17 @@ class <?php echo $controllerName; ?>Controller extends <?php echo $plugin; ?>App
 	var $scaffold;
 <?php else: ?>
 <?php
-echo "\tvar \$helpers = array('Html', 'Form'";
 if (count($helpers)):
-	foreach ($helpers as $help):
-		echo ", '" . Inflector::camelize($help) . "'";
-	endforeach;
+	echo "\tvar \$helpers = array(";
+	for ($i = 0, $len = count($helpers); $i < $len; $i++):
+		if ($i != $len - 1):
+			echo "'" . Inflector::camelize($helpers[$i]) . "', ";
+		else:
+			echo "'" . Inflector::camelize($helpers[$i]) . "'";
+		endif;
+	endfor;
+	echo ");\n";
 endif;
-echo ");\n";
 
 if (count($components)):
 	echo "\tvar \$components = array(";
diff --git a/cake/tests/cases/console/libs/tasks/controller.test.php b/cake/tests/cases/console/libs/tasks/controller.test.php
index 0a40bb229..dd550ed26 100644
--- a/cake/tests/cases/console/libs/tasks/controller.test.php
+++ b/cake/tests/cases/console/libs/tasks/controller.test.php
@@ -260,7 +260,7 @@ class ControllerTaskTest extends CakeTestCase {
 		$result = $this->Task->bake('Articles', '--actions--', $helpers, $components);
 		$this->assertPattern('/class ArticlesController extends AppController/', $result);
 		$this->assertPattern('/\$components \= array\(\'Acl\', \'Auth\'\)/', $result);
-		$this->assertPattern('/\$helpers \= array\(\'Html\', \'Form\', \'Ajax\', \'Time\'\)/', $result);
+		$this->assertPattern('/\$helpers \= array\(\'Ajax\', \'Time\'\)/', $result);
 		$this->assertPattern('/\-\-actions\-\-/', $result);
 
 		$result = $this->Task->bake('Articles', 'scaffold', $helpers, $components);
@@ -268,6 +268,12 @@ class ControllerTaskTest extends CakeTestCase {
 		$this->assertPattern('/var \$scaffold/', $result);
 		$this->assertNoPattern('/helpers/', $result);
 		$this->assertNoPattern('/components/', $result);
+
+		$result = $this->Task->bake('Articles', '--actions--', array(), array());
+		$this->assertPattern('/class ArticlesController extends AppController/', $result);
+		$this->assertNoPattern('/components/', $result);
+		$this->assertNoPattern('/helpers/', $result);
+		$this->assertPattern('/\-\-actions\-\-/', $result);
 	}
 
 /**