diff --git a/cookiecutter.json b/cookiecutter.json
index 5b13854ab..7fd24d7af 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -13,6 +13,7 @@
     "Apache Software License 2.0",
     "Not open source"
   ],
+  "username_type": ["email"],
   "timezone": "UTC",
   "windows": "n",
   "use_pycharm": "n",
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index fd330f0cd..778e3411f 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -43,8 +43,8 @@ def context():
 
 
 SUPPORTED_COMBINATIONS = [
-    # {"username_type": "username"},
-    # {"username_type": "email"},
+    {"username_type": "username"},
+    {"username_type": "email"},
     {"open_source_license": "MIT"},
     {"open_source_license": "BSD"},
     {"open_source_license": "GPLv3"},