diff --git a/rsconcept/backend/templates/password_reset_email.html b/rsconcept/backend/apps/users/templates/password_reset_email.html
similarity index 100%
rename from rsconcept/backend/templates/password_reset_email.html
rename to rsconcept/backend/apps/users/templates/password_reset_email.html
diff --git a/rsconcept/backend/project/settings.py b/rsconcept/backend/project/settings.py
index e0ea326b..55290cb1 100644
--- a/rsconcept/backend/project/settings.py
+++ b/rsconcept/backend/project/settings.py
@@ -32,8 +32,8 @@ ALLOWED_HOSTS = os.environ.get('ALLOWED_HOSTS', '*').split(';')
 INTERNAL_IPS = ['127.0.0.1'] if DEBUG else []
 
 # MAIL SETUP
-EMAIL_HOST = os.environ.get('EMAIL_HOST', 'localhost')
-EMAIL_PORT = os.environ.get('EMAIL_PORT', '1025')
+EMAIL_HOST = os.environ.get('EMAIL_HOST', '')
+EMAIL_PORT = int(os.environ.get('EMAIL_PORT', '1025'))
 EMAIL_USE_SSL = os.environ.get('EMAIL_SSL', False) in _TRUE_VARIANTS
 EMAIL_USE_TLS = os.environ.get('EMAIL_TLS', False) in _TRUE_VARIANTS
 EMAIL_HOST_USER = os.environ.get('EMAIL_HOST_USER', '')