diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
index 84121040e..255e8e3f2 100644
--- a/wolfcrypt/src/asn.c
+++ b/wolfcrypt/src/asn.c
@@ -9461,7 +9461,12 @@ static char GetNameType(CertName* name, int idx)
 #ifdef WOLFSSL_CERT_EXT
     case 7:
         return name->busCatEnc;
+
+    case 8:
+#else
+    case 7:
 #endif
+
     default:
        return 0;
     }
@@ -9493,8 +9498,15 @@ static byte GetNameId(int idx)
     case 6:
        return ASN_COMMON_NAME;
 
+#ifdef WOLFSSL_CERT_EXT
     case 7:
-       return ASN_EMAIL_NAME;
+        return ASN_BUS_CAT;
+
+    case 8:
+#else
+    case 7:
+#endif
+        return ASN_EMAIL_NAME;
 
     default:
        return 0;