diff --git a/conf/init_ynh-vpnclient b/conf/init_ynh-vpnclient
index 1bc066e..09bb7e0 100644
--- a/conf/init_ynh-vpnclient
+++ b/conf/init_ynh-vpnclient
@@ -206,6 +206,7 @@ case "${1}" in
 
         (i=0 && false) || while [ $? -ne 0 ]; do
           sleep 1 && (( i++ ))
+          [ ${i} -gt 20 ] && stop_openvpn
           [ ${i} -gt 20 ] && exit 1
           ip link show dev tun0 &> /dev/null
         done
diff --git a/scripts/install b/scripts/install
index 72bcd61..910b884 100644
--- a/scripts/install
+++ b/scripts/install
@@ -57,7 +57,7 @@ if [ ! $? -eq 0 ]; then
 fi
 
 # Install packages
-sudo apt-get --assume-yes --force-yes install openvpn php5-fpm
+sudo apt-get --assume-yes --force-yes install openvpn php5-fpm sipcalc
 
 # Save arguments
 sudo yunohost app setting vpnclient server_name -v "${server_name}"
diff --git a/scripts/remove b/scripts/remove
index 7648c57..ed3fc5e 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -29,6 +29,6 @@ sudo userdel -f vpnadmin
 
 # Remove packets
 # The yunohost policy is currently to not uninstall packets (dependency problems)
-## sudo apt-get --assume-yes --force-yes remove openvpn php5-fpm
+## sudo apt-get --assume-yes --force-yes remove openvpn php5-fpm sipcalc
 
 exit 0