diff --git a/conf/.env.production b/conf/.env.production
index 462fb7b..bf31765 100644
--- a/conf/.env.production
+++ b/conf/.env.production
@@ -23,9 +23,9 @@ REDIS_URL=redis://127.0.0.1:6379/__REDIS_DB__
 # API_RATE_LIMITS="300 per 5 minutes"
 
 # Emails
-# UI_URL=__DOMAIN__
-# EMAIL_URL=
-# SENDER_EMAIL=
+UI_URL=__DOMAIN__
+EMAIL_URL=smtp://__APP__:__MAIL_PWD__@__DOMAIN__:587/?tls=True
+SENDER_EMAIL=__APP__@__DOMAIN__
 # WORKERS_PROCESSES=
 
 # Workouts
diff --git a/conf/fittrackee.service b/conf/fittrackee.service
index 205b26c..5cab9e3 100644
--- a/conf/fittrackee.service
+++ b/conf/fittrackee.service
@@ -29,7 +29,7 @@ Environment="STATICMAP_SUBDOMAINS="
 Environment="MAP_ATTRIBUTION="
 Environment="WEATHER_API_KEY="
 WorkingDirectory=__INSTALL_DIR__/
-ExecStart=__INSTALL_DIR__/venv/bin/gunicorn -b 127.0.0.1:__PORT__ "fittrackee:create_app()" --error-logfile /var/log/__APP__/gunicorn.log
+ExecStart=__INSTALL_DIR__/venv/bin/gunicorn -b 127.0.0.1:__PORT__ "fittrackee:create_app()" --error-logfile /var/log/__APP__/__APP__.log
 
 
 
diff --git a/config_panel.toml b/config_panel.toml
index b9ad4bc..738ab0a 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -44,4 +44,20 @@ services = ["__APP__", "__APP___workers"]
         help.fr = "Insérer la clé api donnée par le fournisseur météo choisi"
         bind = "WEATHER_API_KEY:/var/www/__APP__/.env"
 
-   
\ No newline at end of file
+        [main.config.email_url]
+        ask.en = "Change SMTP mail address"
+        ask.fr = "Changer l’adresse courriel SMTP"
+        type = "string"
+        help.en = "Has to be like this: smtp://username:password@example.com:587/?tls=True. ❗ Please backup your original credentials for the case you want to reset it. "
+        help.fr = "Doit avoir la forme suivante : smtp://username:password@example.com:587/?tls=True. ❗ Veuillez sauvegarder vos coordonnées initiales au cas où vous voudriez les réinitialiser."
+        bind = "email_url:/var/www/__APP__/.env"
+
+        [main.config.sender_email]
+        ask.en = "Change sender email"
+        ask.fr = "Changer l’adresse courriel d’envoi"
+        type = "email"
+        bind = "sender_email:/var/www/__APP__/.env"
+
+               
+
+   
diff --git a/manifest.toml b/manifest.toml
index c4fe07c..f953b67 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -63,6 +63,7 @@ ram.runtime = "50M"
 
   [resources]
     [resources.system_user]
+    allow_email = true
 
     [resources.install_dir]
 
diff --git a/scripts/install b/scripts/install
index b3fe050..b49e7f1 100755
--- a/scripts/install
+++ b/scripts/install
@@ -108,7 +108,7 @@ ynh_add_systemd_config --service="${app}_workers" --template="fittrackee_workers
 # INTEGRATE SERVICE IN YUNOHOST
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add "${app}" --description="Fittrackee main service" --log="/var/log/$app/$app.log" --log="/var/log/$app/gunicorn.log"
+yunohost service add "${app}" --description="Fittrackee main service" --log="/var/log/$app/$app.log"
 yunohost service add "${app}_workers" --description="Fittrackee task queue service" --log="var/log/$app/${app}_workers.log"
 
 
diff --git a/scripts/restore b/scripts/restore
index 458f492..be9370f 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -67,7 +67,7 @@ systemctl enable "${app}_workers.service" --quiet
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add "${app}" --description="Fittrackee main service" --log="/var/log/$app/$app.log" --log="/var/log/$app/gunicorn.log"
+yunohost service add "${app}" --description="Fittrackee main service" --log="/var/log/$app/$app.log"
 yunohost service add "${app}_workers" --description="Fittrackee task queue service" --log="var/log/$app/${app}_workers.log"
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 3d62385..8115a74 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -114,7 +114,7 @@ ynh_add_systemd_config --service="${app}_workers" --template="fittrackee_workers
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add "${app}" --description="Fittrackee main service" --log="/var/log/$app/$app.log" --log="/var/log/$app/gunicorn.log"
+yunohost service add "${app}" --description="Fittrackee main service" --log="/var/log/$app/$app.log"
 yunohost service add "${app}_workers" --description="Fittrackee task queue service" --log="var/log/$app/${app}_workers.log"
 
 #=================================================