diff --git a/openvpn-install.sh b/openvpn-install.sh
index 403e0fd..1b37e46 100644
--- a/openvpn-install.sh
+++ b/openvpn-install.sh
@@ -109,6 +109,8 @@ if [[ -e /etc/openvpn/server.conf ]]; then
 				cp /etc/openvpn/easy-rsa/pki/crl.pem /etc/openvpn/crl.pem
 				# CRL is read with each client connection, when OpenVPN is dropped to nobody
 				chown nobody:$GROUPNAME /etc/openvpn/crl.pem
+				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!"
 			else
@@ -153,6 +155,12 @@ 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 -f /etc/sysctl.d/30-openvpn-forward.conf
 				echo