diff --git a/src/Application.hs b/src/Application.hs
index a810dc36a..fbb444868 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -20,6 +20,7 @@ module Application
     ) where
 
 import Control.Monad.Logger                 (liftLoc, runLoggingT)
+import Database.Persist.Sql                 (runMigrationUnsafe)
 import Database.Persist.Postgresql          (createPostgresqlPool, pgConnStr,
                                              pgPoolSize, runSqlPool)
 import Import
@@ -79,7 +80,7 @@ makeFoundation appSettings = do
         (pgPoolSize $ appDatabaseConf appSettings)
 
     -- Perform database migration using our application's logging settings.
-    runLoggingT (runSqlPool (runMigration migrateAll) pool) logFunc
+    runLoggingT (runSqlPool (runMigrationUnsafe migrateAll) pool) logFunc
 
     -- Return the foundation
     return $ mkFoundation pool
@@ -132,7 +133,7 @@ getApplicationDev = do
     return (wsettings, app)
 
 getAppDevSettings :: IO AppSettings
-getAppDevSettings = loadYamlSettings [".dbsettings.yml", "config/test-settings.yml", configSettingsYml] [configSettingsYmlValue] useEnv
+getAppDevSettings = loadYamlSettings ["config/settings.yml", "config/test-settings.yml", configSettingsYml] [configSettingsYmlValue] useEnv
 
 -- | main function for use by yesod devel
 develMain :: IO ()