diff --git a/openvpn-install.sh b/openvpn-install.sh
index b66abd9..83c892f 100644
--- a/openvpn-install.sh
+++ b/openvpn-install.sh
@@ -146,7 +146,8 @@ if [[ -e /etc/openvpn/server.conf ]]; then
 			rm -rf /etc/openvpn/crl.pem
 			cp /etc/openvpn/easy-rsa/pki/crl.pem /etc/openvpn/crl.pem
 			chmod 644 /etc/openvpn/crl.pem
-			cd /home/ && rm $(find . -maxdepth 2 | grep $CLIENT.ovpn) || rm /root/$CLIENT.ovpn
+			rm -rf $(find /home -maxdepth 2 | grep $CLIENT.ovpn) 2>/dev/null
+			rm -rf /root/$CLIENT.ovpn 2>/dev/null
 			echo ""
 			echo "Certificate for client $CLIENT revoked"
 			echo "Exiting..."
@@ -189,9 +190,14 @@ if [[ -e /etc/openvpn/server.conf ]]; then
 				else
 					yum remove openvpn -y
 				fi
+				OVPNS=$(ls /etc/openvpn/easy-rsa/pki/issued | awk -F "." {'print $1'})
+				for i in $OVPNS
+				do
+				rm $(find /home -maxdepth 2 | grep $i.ovpn) 2>/dev/null
+				rm /root/$i.ovpn 2>/dev/null
+				done
 				rm -rf /etc/openvpn
 				rm -rf /usr/share/doc/openvpn*
-				cd /home/ && rm $(find . -maxdepth 2 | grep .ovpn) || rm /root/*.ovpn
 				echo ""
 				echo "OpenVPN removed!"
 			else