diff --git a/scripts/backup b/scripts/backup
index 8030bf1..43b6047 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -4,5 +4,6 @@ backup_dir="${1}/apps/vpnclient"
 mkdir -p "${backup_dir}/"
 
 sudo cp -a /etc/openvpn/keys/ "${backup_dir}/"
+sudo cp -a /etc/openvpn/client.conf.tpl "${backup_dir}/"
 
 exit 0
diff --git a/scripts/install b/scripts/install
index b742620..29ce951 100644
--- a/scripts/install
+++ b/scripts/install
@@ -89,7 +89,7 @@ sudo chown -R root: /var/www/vpnadmin/
 sudo chmod -R 0644 /var/www/vpnadmin/*
 sudo find /var/www/vpnadmin/ -type d -exec chmod +x {} \;
 
-# Copy certificates
+# Create certificates directory
 sudo mkdir -pm 0770 /etc/openvpn/keys/
 sudo chown root:admins /etc/openvpn/keys/
 
diff --git a/scripts/restore b/scripts/restore
index ef0ba1b..7b88ea1 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -4,6 +4,7 @@ backup_dir="${1}/apps/vpnclient"
 
 sudo mkdir -p /etc/openvpn/
 sudo cp -a "${backup_dir}/keys/" /etc/openvpn/
+sudo cp -a "${backup_dir}/client.conf.tpl" /etc/openvpn/
 sudo chown -R root:admins /etc/openvpn/keys/
 
 gitcommit=$(sudo grep revision /etc/yunohost/apps/vpnclient/status.json | sed 's/.*"revision": "\([^"]\+\)".*/\1/')
diff --git a/scripts/upgrade b/scripts/upgrade
index dd0c991..529a0b2 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -17,12 +17,17 @@ tmpdir=$(mktemp -dp /tmp/ vpnclient-upgrade-XXXXX)
 sudo cp -a /etc/yunohost/apps/vpnclient/settings.yml "${tmpdir}/"
 sudo cp -a /etc/openvpn/keys/ "${tmpdir}/"
 
+if [ ! -e /etc/openvpn/client.conf.tpl.restore ] || ! cmp -s /etc/openvpn/client.conf.tpl{,.restore}; then
+  sudo cp -a /etc/openvpn/client.conf.tpl "${tmpdir}/"
+fi
+
 export VPNCLIENT_UPGRADE=1
 sudo bash /etc/yunohost/apps/vpnclient/scripts/remove &> /dev/null
 bash ./install "${domain}" "${path}" "${server_name}"
 
 sudo cp -a "${tmpdir}/settings.yml" /etc/yunohost/apps/vpnclient/
 sudo cp -a "${tmpdir}/keys/"* /etc/openvpn/keys/ 2> /dev/null
+sudo cp -a "${tmpdir}/client.conf.tpl" /etc/openvpn/ 2> /dev/null
 sudo rm -r "${tmpdir}/"
 
 # Changes