diff --git a/build_key-pass.sh b/build_key-pass.sh
index 1dab6fe..e7c7c7d 100755
--- a/build_key-pass.sh
+++ b/build_key-pass.sh
@@ -199,6 +199,10 @@ for _name in $key_names_reserverd ; do
    [[ "$_name" = "$NEW_KEY_NAME" ]] && fatal "Name '$NEW_KEY_NAME' cannot be used - its a reserved name!"
 done
 
+if [[ -f "${OPENVPN_BASE_DIR}/keys/${NEW_KEY_NAME}.key" ]]; then
+   fatal "Name '$NEW_KEY_NAME' is already in use"
+fi
+
 echo ""
 echo -e "\033[32m--\033[m"
 echo ""
@@ -317,7 +321,7 @@ else
    error "$(cat $log_file)"
 fi
 
-_client_conf_file="${OPENVPN_BASE_DIR}/${NEW_KEY_NAME}.conf.sample"
+_client_conf_file="${OPENVPN_BASE_DIR}/${NEW_KEY_NAME}.conf"
 echononl "   Create sample client configuration ${_client_conf_file}.."
 cat << EOF > "$_client_conf_file"  2> $log_file
 ##############################################