diff --git a/src/djinit/templates/config/settings/production.py-tpl b/src/djinit/templates/config/settings/production.py-tpl
index 7d58363..d22ba79 100644
--- a/src/djinit/templates/config/settings/production.py-tpl
+++ b/src/djinit/templates/config/settings/production.py-tpl
@@ -42,13 +42,13 @@ CORS_ALLOW_PRIVATE_NETWORK = False
 
 # Email settings
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-EMAIL_HOST = env('EMAIL_HOST')
+EMAIL_HOST = env('EMAIL_HOST', default="smtp.gmail.com")
 EMAIL_PORT = env.int('EMAIL_PORT', default=587)
 EMAIL_USE_TLS = env.bool('EMAIL_USE_TLS', default=True)
-EMAIL_HOST_USER = env('EMAIL_HOST_USER')
-EMAIL_HOST_PASSWORD = env('EMAIL_HOST_PASSWORD')
-DEFAULT_FROM_EMAIL = env('EMAIL_HOST_USER')
-SERVER_EMAIL = env('EMAIL_HOST_USER')
+EMAIL_HOST_USER = env('EMAIL_HOST_USER', default="")
+EMAIL_HOST_PASSWORD = env('EMAIL_HOST_PASSWORD', default="")
+DEFAULT_FROM_EMAIL = env('EMAIL_HOST_USER', default="")
+SERVER_EMAIL = env('EMAIL_HOST_USER', default="")
 
 # Security settings for production
 SECURE_SSL_REDIRECT = True
diff --git a/src/djinit/templates/project/env_sample-tpl b/src/djinit/templates/project/env_sample-tpl
index 382da28..bdeca01 100644
--- a/src/djinit/templates/project/env_sample-tpl
+++ b/src/djinit/templates/project/env_sample-tpl
@@ -1,6 +1,6 @@
 # Django settings
 DJANGO_SETTINGS_MODULE=[[ project_name ]].settings.development
-SECRET_KEY= your-secret-key
+SECRET_KEY=your-secret-key
 ALLOWED_HOSTS=api.your-domain.com,www.your-domain.com
 
 # @IF use_database_url