diff --git a/src/Shell/BakeShell.php b/src/Shell/BakeShell.php
index f6a006d63..a6978d70f 100644
--- a/src/Shell/BakeShell.php
+++ b/src/Shell/BakeShell.php
@@ -78,7 +78,7 @@ public function main()
             $args = $this->args;
             array_shift($args);
             $args = implode($args, ' ');
-            $this->out(sprintf('    bin/cake bake template %s', $args), 2);
+            $this->out(sprintf('    <info>`bin/cake bake template %s`</info>', $args), 2);
             return false;
         }
 
@@ -296,6 +296,8 @@ public function getOptionParser()
         ])->addOption('plugin', [
             'short' => 'p',
             'help' => 'Plugin to bake into.'
+        ])->addOption('prefix', [
+            'help' => 'Prefix to bake controllers and templates into.'
         ])->addOption('theme', [
             'short' => 't',
             'help' => 'The theme to use when baking code.',
diff --git a/tests/TestCase/Shell/BakeShellTest.php b/tests/TestCase/Shell/BakeShellTest.php
index 12a48f337..de30acab2 100644
--- a/tests/TestCase/Shell/BakeShellTest.php
+++ b/tests/TestCase/Shell/BakeShellTest.php
@@ -87,7 +87,7 @@ public function testAllWithModelName()
             ->with('Comments');
 
         $this->Shell->connection = '';
-        $this->Shell->params = [];
+        $this->Shell->params = ['prefix' => 'account'];
         $this->Shell->all('Comments');
 
         $output = $this->out->messages();