diff --git a/packages/cli/create-medusa-app/src/utils/create-db.ts b/packages/cli/create-medusa-app/src/utils/create-db.ts
index 69a69e5c66..f748cd7e7d 100644
--- a/packages/cli/create-medusa-app/src/utils/create-db.ts
+++ b/packages/cli/create-medusa-app/src/utils/create-db.ts
@@ -105,10 +105,23 @@ async function getForDbName({
     postgresUsername = answers.postgresUsername
     postgresPassword = answers.postgresPassword
 
+    const { userDbName } = await inquirer.prompt([
+      {
+        type: "database",
+        name: "userDbName",
+        message: "Enter your Postgres user's database name",
+        default: answers.postgresUsername,
+        validate: (input) => {
+          return typeof input === "string" && input.length > 0
+        },
+      },
+    ])
+
     try {
       client = await postgresClient({
         user: postgresUsername,
         password: postgresPassword,
+        database: userDbName,
         ...defaultConnectionOptions
       })
     } catch (e) {
diff --git a/packages/cli/create-medusa-app/src/utils/prepare-project.ts b/packages/cli/create-medusa-app/src/utils/prepare-project.ts
index d6e92684c2..fcb167288a 100644
--- a/packages/cli/create-medusa-app/src/utils/prepare-project.ts
+++ b/packages/cli/create-medusa-app/src/utils/prepare-project.ts
@@ -173,9 +173,7 @@ export default async ({
       ...factBoxOptions,
       message: "Ran Migrations",
     })
-  }
 
-  if (!skipDb && migrations) {
     // create admin user
     factBoxOptions.interval = displayFactBox({
       ...factBoxOptions,
@@ -204,9 +202,7 @@ export default async ({
       ...factBoxOptions,
       message: "Created admin user",
     })
-  }
 
-  if (!skipDb && migrations) {
     // TODO for now we just seed the default data
     // we should add onboarding seeding again if it makes
     // since once we re-introduce the onboarding flow.