diff --git a/Makefile b/Makefile
index a7066bdccee67..cd7f5c31568a3 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,12 @@ superset:
 	pip install -e .
 
 	# Create an admin user in your metadata database
-	superset fab create-admin
+	superset fab create-admin \
+                    --username admin \
+                    --firstname Admin \
+                    --lastname Strator \
+                    --email admin@superset.io \
+                    --password admin
 
 	# Initialize the database
 	superset db upgrade
@@ -67,7 +72,7 @@ venv:
 	. venv/bin/activate
 
 activate:
-	source venv/bin/activate
+	. venv/bin/activate
 
 pre-commit:
 	# setup pre commit dependencies
@@ -98,3 +103,6 @@ build-cypress:
 open-cypress:
 	if ! [ $(port) ]; then cd superset-frontend/cypress-base; CYPRESS_BASE_URL=http://localhost:9000 npm run cypress open; fi
 	cd superset-frontend/cypress-base; CYPRESS_BASE_URL=http://localhost:$(port) npm run cypress open
+
+admin-user:
+	superset fab create-admin