diff --git a/conf/grafana.ini b/conf/grafana.ini
index 721b537..14f3342 100644
--- a/conf/grafana.ini
+++ b/conf/grafana.ini
@@ -856,13 +856,13 @@ allow_sign_up = true
 [smtp]
 enabled = true
 host = localhost:25
-;user = __APP__
+user = __APP__
 # If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
 password = __MAIL_PWD__
 ;cert_file =
 ;key_file =
 ;skip_verify = false
-from_address = admin@__DOMAIN__
+from_address = __APP__@__DOMAIN__
 from_name = Grafana
 # EHLO identity in SMTP dialog (defaults to instance_name)
 ;ehlo_identity = dashboard.example.com
diff --git a/manifest.toml b/manifest.toml
index d31047b..1031af3 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "Grafana"
 description.en = "Metric & analytic dashboards for monitoring"
 description.fr = "Tableaux de bord de supervision"
 
-version = "10.1.5~ynh2"
+version = "10.2.3~ynh1"
 
 maintainers = ["JimboJoe"]
 
diff --git a/scripts/_common.sh b/scripts/_common.sh
index d27b9e5..c7f3f74 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -5,7 +5,7 @@
 #=================================================
 
 # Debian package version for Grafana
-GRAFANA_VERSION="10.2.1"
+GRAFANA_VERSION="$(ynh_read_manifest --key='version' | | cut -d~ -f1)"
 
 #=================================================
 # PERSONAL HELPERS