diff --git a/circuits-circom/circuits/namecheap/namecheap_push.circom b/circuits-circom/circuits/namecheap/namecheap_push.circom
index 48a69924..35611756 100644
--- a/circuits-circom/circuits/namecheap/namecheap_push.circom
+++ b/circuits-circom/circuits/namecheap/namecheap_push.circom
@@ -1,5 +1,6 @@
 pragma circom 2.1.9;
 
+include "../node_modules/circomlib/circuits/bitify.circom";
 include "circomlib/circuits/poseidon.circom";
 include "@zk-email/circuits/utils/regex.circom";
 include "@zk-email/circuits/helpers/email-nullifier.circom";
@@ -97,6 +98,10 @@ template NamecheapPushDomainVerifier(maxHeadersLength, maxBodyLength, n, k) {
     // Output packed email from
     signal input fromEmailIndex;
     
+    // Assert the bit-length of fromEmailIndex
+    component fromEmailIndexBits = Num2Bits(log2Ceil(maxHeadersLength));
+    fromEmailIndexBits.in <== fromEmailIndex;
+
     // Assert fromEmailIndex < emailHeaderLength
     signal isFromIndexValid <== LessThan(log2Ceil(maxHeadersLength))([fromEmailIndex, emailHeaderLength]);
     isFromIndexValid === 1;
@@ -105,6 +110,10 @@ template NamecheapPushDomainVerifier(maxHeadersLength, maxBodyLength, n, k) {
 
     // Packed buyer id (Hashed before making public output)
     signal input namecheapBuyerIdIndex;
+
+    // Assert the bit-length of namecheapBuyerIdIndex
+    component namecheapBuyerIdIndexBits = Num2Bits(log2Ceil(maxBodyLength));
+    namecheapBuyerIdIndexBits.in <== namecheapBuyerIdIndex;
     
     // Assert namecheapBuyerIdIndex < emailBodyLength
     signal namecheapBuyerIdIndexValid <== LessThan(log2Ceil(maxBodyLength))([namecheapBuyerIdIndex, emailBodyLength]);
@@ -114,6 +123,10 @@ template NamecheapPushDomainVerifier(maxHeadersLength, maxBodyLength, n, k) {
 
     // Output packed domain name
     signal input namecheapDomainNameIndex;
+
+    // Assert the bit-length of namecheapDomainNameIndex
+    component namecheapDomainNameIndexBits = Num2Bits(log2Ceil(maxBodyLength));
+    namecheapDomainNameIndexBits.in <== namecheapDomainNameIndex;
     
     // Assert namecheapDomainNameIndex < emailBodyLength
     signal namecheapDomainNameIndexValid <== LessThan(log2Ceil(maxBodyLength))([namecheapDomainNameIndex, emailBodyLength]);