diff --git a/lib/Cake/Console/Command/Task/DbConfigTask.php b/lib/Cake/Console/Command/Task/DbConfigTask.php
index a47762c19..c9cdfd057 100644
--- a/lib/Cake/Console/Command/Task/DbConfigTask.php
+++ b/lib/Cake/Console/Command/Task/DbConfigTask.php
@@ -87,7 +87,7 @@ class DbConfigTask extends AppShell {
  */
 	protected function _interactive() {
 		$this->hr();
-		$this->out('Database Configuration:');
+		$this->out(__d('cake_console', 'Database Configuration:'));
 		$this->hr();
 		$done = false;
 		$dbConfigs = array();
diff --git a/lib/Cake/Console/Shell.php b/lib/Cake/Console/Shell.php
index 3dbdc62b8..ca4ff7d4e 100644
--- a/lib/Cake/Console/Shell.php
+++ b/lib/Cake/Console/Shell.php
@@ -465,7 +465,7 @@ class Shell extends Object {
 			}
 		}
 		if (is_array($options)) {
-			while ($in === '' || ($in !== '' && (!in_array(strtolower($in), $options) && !in_array(strtoupper($in), $options)) && !in_array($in, $options))) {
+			while ($in === '' || !(in_array(strtolower($in), $options) || in_array(strtoupper($in), $options) || in_array($in, $options))) {
 				$in = $this->_getInput($prompt, $options, $default);
 			}
 		}