diff --git a/scripts/makeOVPN.sh b/scripts/makeOVPN.sh
index 29605eb..c06f2fa 100755
--- a/scripts/makeOVPN.sh
+++ b/scripts/makeOVPN.sh
@@ -8,7 +8,7 @@ KEY=".key"
 CA="ca.crt"
 TA="ta.key"
 INDEX="/etc/openvpn/easy-rsa/pki/index.txt"
-INSTALL_USER=$(cat /etc/pivpn/INSTALL_USER)
+INSTALL_USER=$(</etc/pivpn/INSTALL_USER)
 
 helpFunc() {
     echo "::: Create a client ovpn profile, optional nopass"
@@ -403,7 +403,8 @@ if [ $RESPONSE == "y" ] || [ $RESPONSE == "Y" ]; then
   fi
 
 # Copy the .ovpn profile to the home directory for convenient remote access
-INSTALL_HOME=$(cat /etc/passwd | grep "$INSTALL_USER" | cut -d: -f6)
+INSTALL_HOME=$(grep -m1 "^${INSTALL_USER}:" /etc/passwd | cut -d: -f6)
+INSTALL_HOME=${INSTALL_HOME%/} # remove possible trailing slash
 cp "/etc/openvpn/easy-rsa/pki/$NAME$FILEEXT" "$INSTALL_HOME/ovpns/$NAME$FILEEXT"
 chown "$INSTALL_USER" "$INSTALL_HOME/ovpns/$NAME$FILEEXT"
 chmod 640 "/etc/openvpn/easy-rsa/pki/$NAME$FILEEXT"