diff --git a/ppp.c b/ppp.c
index 5687524..a7d8a2b 100644
--- a/ppp.c
+++ b/ppp.c
@@ -2628,13 +2628,13 @@ uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, sessionidt s, tunnelid
 			bid = 0;
 	}
 
-	if (type == PPPLCP || !(session[s].flags & SESSION_ACFC))
+	if (type == PPPLCP || !(session[s].flags & SESSION_ACFC) || session[s].forwardtosession)
 	{
 		*(uint16_t *) b = htons(0xFF03); // HDLC header
 		b += 2;
 	}
 
-	if (type < 0x100 && session[s].flags & SESSION_PFC)
+	if ((type < 0x100 && session[s].flags & SESSION_PFC) && !session[s].forwardtosession)
 	{
 		*b++ = type;
 	}