diff --git a/scripts/install b/scripts/install
index bb64ab9..f24c8d2 100644
--- a/scripts/install
+++ b/scripts/install
@@ -54,7 +54,6 @@ ynh_script_progression --message="Storing installation settings..."
 
 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=admin --value=$admin
-ynh_app_setting_set --app=$app --key=admin_email --value=$admin_email
 ynh_app_setting_set --app=$app --key=datadir --value=$datadir
 
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index fa4533b..b5cff17 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -23,7 +23,8 @@ rtmp_port=$(ynh_app_setting_get --app=$app --key=rtmp_port)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$app
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-admin_email=$(ynh_app_setting_get --app=$app --key=admin_email)
+admin=$(ynh_app_setting_get --app=$app --key=admin)
+admin_email=$(ynh_user_get_info --username=$admin --key="mail")
 datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 13d8e5a..3e3dead 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -24,6 +24,8 @@ rtmp_port=$(ynh_app_setting_get --app=$app --key=rtmp_port)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd)
 datadir=$(ynh_app_setting_get --app=$app --key=datadir)
+admin=$(ynh_app_setting_get --app=$app --key=admin)
+admin_email=$(ynh_user_get_info --username=$admin --key="mail")
 
 #=================================================
 # CHECK VERSION
@@ -38,6 +40,7 @@ upgrade_type=$(ynh_check_app_version_changed)
 ynh_script_progression --message="Ensuring downward compatibility..."
 
 ynh_app_setting_delete --app=$app --key=admin_pass
+ynh_app_setting_delete --app=$app --key=admin_email
 
 # If db_name doesn't exist, create it
 if [ -z "$db_name" ]; then