diff --git a/make_default_user.mk b/make_default_user.mk
index ef250ea9f5d33b41d3ddeea65e646eb7dff04234..4c1761c51ef4159d69f16c1f5a6e389ecc6665bd 100644
--- a/make_default_user.mk
+++ b/make_default_user.mk
@@ -1,5 +1,12 @@
 .PHONY: make_default_user
 
 make_default_user:
-	$(PYTHON) manage.py create_dev_user --email="$(USER_EMAIL)" --password="balkan"
+    ifndef USER_EMAIL
+        USER_EMAIL := $(shell git config --global user.email)
+    endif
 
+    ifndef USER_PASSWORD
+        USER_PASSWORD := balkan
+    endif
+
+	$(PYTHON) manage.py create_dev_user --email="$(USER_EMAIL)" --password="$(USER_PASSWORD)"