diff --git a/cake/console/templates/default/views/form.ctp b/cake/console/templates/default/views/form.ctp
index 8095f6478..a86f034cc 100644
--- a/cake/console/templates/default/views/form.ctp
+++ b/cake/console/templates/default/views/form.ctp
@@ -24,7 +24,7 @@
 <?php
 		echo "\t<?php\n";
 		foreach ($fields as $field) {
-			if (substr($action, 'add') !== false && $field == $primaryKey) {
+			if (strpos($action, 'add') !== false && $field == $primaryKey) {
 				continue;
 			} elseif (!in_array($field, array('created', 'modified', 'updated'))) {
 				echo "\t\techo \$this->Form->input('{$field}');\n";
diff --git a/cake/tests/cases/console/libs/tasks/view.test.php b/cake/tests/cases/console/libs/tasks/view.test.php
index be7e9321c..70715288f 100644
--- a/cake/tests/cases/console/libs/tasks/view.test.php
+++ b/cake/tests/cases/console/libs/tasks/view.test.php
@@ -336,6 +336,11 @@ class ViewTaskTest extends CakeTestCase {
 		$this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'name\'\]/', $result);
 		$this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'body\'\]/', $result);
 
+		$result = $this->Task->getContent('admin_add', $vars);
+		$this->assertPattern("/input\('name'\)/", $result);
+		$this->assertPattern("/input\('body'\)/", $result);
+		$this->assertPattern('/List .+Test View Models/', $result);
+
 		Configure::write('Routing', $_back);
 	}