diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs
index 9e5d667a..9ee58e6e 100644
--- a/yesod/Scaffolding/Scaffolder.hs
+++ b/yesod/Scaffolding/Scaffolder.hs
@@ -22,7 +22,8 @@ prompt f = do
     if f s
         then return s
         else do
-            putStrLn "That was not a valid entry, please try again: "
+            putStr "That was not a valid entry, please try again: "
+            hFlush stdout
             prompt f
 
 qq :: String
@@ -45,7 +46,7 @@ backends = [minBound .. maxBound]
 scaffold :: IO ()
 scaffold = do
     puts $(codegenDir "input" "welcome")
-    name <- getLine
+    name <- prompt $ not . null
 
     puts $(codegenDir "input" "project-name")
     let validPN c
@@ -54,7 +55,7 @@ scaffold = do
             | '0' <= c && c <= '9' = True
         validPN '-' = True
         validPN _ = False
-    project <- prompt $ all validPN
+    project <- prompt $ \s -> all validPN s && not (null s)
     let dir = project
 
     puts $(codegenDir "input" "site-arg")
diff --git a/yesod/input/database.cg b/yesod/input/database.cg
index 4d8d2aff..f25b7b32 100644
--- a/yesod/input/database.cg
+++ b/yesod/input/database.cg
@@ -5,5 +5,10 @@ We recommend starting with SQLite: it has no dependencies.
 We have another option: a tiny project with minimal dependencies.
 Mostly this means no database and no authentication.
 
-So, what'll it be?
-s for sqlite, p for postgresql, m for mongodb, or t for tiny: 
+    s     = sqlite
+    p     = postgresql
+    mongo = mongodb
+    t     = tiny
+    mysql = MySQL (experimental)
+
+So, what'll it be?