diff --git a/lib/perl/OVH/Bastion/allowkeeper.inc b/lib/perl/OVH/Bastion/allowkeeper.inc
index db76bc7..654bd27 100644
--- a/lib/perl/OVH/Bastion/allowkeeper.inc
+++ b/lib/perl/OVH/Bastion/allowkeeper.inc
@@ -761,6 +761,14 @@ sub access_modify {
                             $shouldDelete = 0;
                         }
 
+                        # validate portforwarding if defined
+                        if ($shouldDelete && defined $remotePort) {
+                            $shouldDelete = 0 unless $line =~ m{\# REMOTEPORT=\Q$remotePort\E(\s|$)};
+                        }
+                        elsif ($shouldDelete && $line =~ m{\# REMOTEPORT=}) {
+                            $shouldDelete = 0;
+                        }
+
                         if ($shouldDelete) {
                             chomp $line;
                             $line = "# $line # $comment\n";