diff --git a/bin/v-add-firewall-rule b/bin/v-add-firewall-rule
index 126f62b49..56a6fcf48 100755
--- a/bin/v-add-firewall-rule
+++ b/bin/v-add-firewall-rule
@@ -52,7 +52,7 @@ is_system_enabled "$FIREWALL_SYSTEM" 'FIREWALL_SYSTEM'
 get_next_fw_rule
 validate_format 'rule'
 is_object_new '../../data/firewall/rules' 'RULE' "$rule"
-if [ ! -z "$comment"]; then
+if [ ! -z "$comment" ]; then
     validate_format 'comment'
 fi
 
diff --git a/bin/v-update-firewall b/bin/v-update-firewall
index 65b9438dd..04a15a5fe 100755
--- a/bin/v-update-firewall
+++ b/bin/v-update-firewall
@@ -51,6 +51,12 @@ if [ $? -ne 0 ]; then
     conntrack_ftp='no'
 fi
 
+# Checking custom OpenSSH  port
+sshport=$(grep '^Port ' /etc/ssh/sshd_config | head -1 | cut -d ' ' -f 2)
+if [[ "$sshport" =~ ^[0-9]+$ ]] && [ "$sshport" -ne "22"  ]; then
+    sed -i "s/PORT='22'/PORT=\'$sshport\'/" $rules
+fi
+
 # Creating temporary file
 tmp=$(mktemp)