diff --git a/token-validator/token.go b/token-validator/token.go
index 1f91153..14abd98 100644
--- a/token-validator/token.go
+++ b/token-validator/token.go
@@ -9,7 +9,8 @@ func GenerateToken(pkey []byte, id int, a ...[]byte) ([]byte, error) {
 	h := sha512.New()
 
 	h.Write([]byte(fmt.Sprintf("%x", pkey)))
-	if id != 0 {
+	// Challenge toctoc(6) should not have that
+	if id != 0 && id != 6 {
 		h.Write([]byte(fmt.Sprintf(":%d", id)))
 	}