diff --git a/scripts/install b/scripts/install
index 415c55f..68abed4 100755
--- a/scripts/install
+++ b/scripts/install
@@ -160,11 +160,7 @@ mkdir -p /var/log/$app
 python3 -m venv $final_path
 export HOME=$final_path
 $final_path/bin/pip3 install --upgrade pip setuptools wheel
-$final_path/bin/pip3 install --upgrade $final_path/src/mautrix-telegram.tar.gz[speedups,qr_login] # metrics,e2be,hq_thumbnails,sqlite,formattednumbers
-
-if [ $encryption -eq 1 ]; then
-  $final_path/bin/pip3 install --upgrade $final_path/src/mautrix-telegram.tar.gz[e2be]
-fi
+$final_path/bin/pip3 install --upgrade $final_path/src/mautrix-telegram.tar.gz[e2be,speedups,qr_login] # metrics,hq_thumbnails,sqlite,formattednumbers
 
 #=================================================
 # REGISTER SYNAPSE APP-SERVICE
diff --git a/scripts/upgrade b/scripts/upgrade
index df3fee4..0e4aa19 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -76,6 +76,27 @@ then
   ynh_app_setting_set --app=$app --key=appserviceid --value=$appserviceid
 fi
 
+# If db_name doesn't exist, create it
+if [ -z "$db_name" ]
+then
+  db_name=$(ynh_app_setting_get --app=$app --key=mautrix_bridge_db_name)
+  ynh_app_setting_set --app=$app --key=db_name --value=$db_name
+fi
+
+# If db_pwd doesn't exist, create it
+if [ -z "$db_pwd" ]
+then
+  db_pwd=$(ynh_app_setting_get --app=$app --key=mautrix_bridge_db_pwd)
+  ynh_app_setting_set --app=$app --key=psqlpwd --value=$db_pwd
+fi
+
+# If synapse_registration_path doesn't exist, create it
+if [ -z "$synapse_registration_path" ]
+then
+  synapse_registration_path=$(ynh_app_setting_get --app=$app --key=app_service_registration_path)
+  ynh_app_setting_set --app=$app --key=synapse_registration_path --value=$synapse_registration_path
+fi
+
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
@@ -140,11 +161,7 @@ ynh_script_progression --message="Upgrading Mautrix-Bridge Python Module..." --w
 python3 -m venv $final_path
 export HOME=$final_path
 $final_path/bin/pip3 install --upgrade pip setuptools wheel
-$final_path/bin/pip3 install --upgrade $final_path/src/mautrix-telegram.tar.gz[speedups,qr_login] # metrics,e2be,hq_thumbnails,sqlite,formattednumbers
-
-if [ $encryption -eq 1 ]; then
-	$final_path/bin/pip3 install --upgrade $final_path/src/mautrix-telegram.tar.gz[e2be]
-fi
+$final_path/bin/pip3 install --upgrade $final_path/src/mautrix-telegram.tar.gz[e2be,speedups,qr_login] # metrics,hq_thumbnails,sqlite,formattednumbers
 
 #=================================================
 # REGISTER SYNAPSE APP-SERVICE