diff --git a/script/monitor/checks/GENERIC_NGINX_CHECK.sh b/script/monitor/checks/GENERIC_NGINX_CHECK.sh
index 7c0e66a..2b734c6 100755
--- a/script/monitor/checks/GENERIC_NGINX_CHECK.sh
+++ b/script/monitor/checks/GENERIC_NGINX_CHECK.sh
@@ -1,7 +1,10 @@
 #!/bin/bash
 
 _REMOTE_HOST="${1:?"FQDN of server missing"}"
-_REMOTE_PORT="${2:-"22"}"
+_REMOTE_PORT="${_REMOTE_HOST}:"
+_REMOTE_PORT="${_REMOTE_PORT#*:}"
+_REMOTE_PORT="${_REMOTE_PORT%%:*}"
+_REMOTE_PORT="${_REMOTE_PORT:-"22"}"
 _REMOTE_USER="monitoring"
 _SOCKET='~/.ssh/%r@%h:%p'
 
diff --git a/script/monitor/checks/GENERIC_ZFSPOOL_USAGE_CHECK.sh b/script/monitor/checks/GENERIC_ZFSPOOL_USAGE_CHECK.sh
index db1461f..ad3099d 100755
--- a/script/monitor/checks/GENERIC_ZFSPOOL_USAGE_CHECK.sh
+++ b/script/monitor/checks/GENERIC_ZFSPOOL_USAGE_CHECK.sh
@@ -1,7 +1,10 @@
 #!/bin/bash
 
 _REMOTE_HOST="${1:?"FQDN of server missing"}"
-_REMOTE_PORT="${2:-"22"}"
+_REMOTE_PORT="${_REMOTE_HOST}:"
+_REMOTE_PORT="${_REMOTE_PORT#*:}"
+_REMOTE_PORT="${_REMOTE_PORT%%:*}"
+_REMOTE_PORT="${_REMOTE_PORT:-"22"}"
 _REMOTE_USER="monitoring"
 _SOCKET='~/.ssh/%r@%h:%p'