diff --git a/meson.options b/meson.options
index 205ce71..f1adf15 100644
--- a/meson.options
+++ b/meson.options
@@ -191,20 +191,25 @@
 )
 
 option(
-    'mutual-tls-common-name-parsing',
+    'mutual-tls-common-name-parsing-default',
     type: 'combo',
-    choices: ['username', 'meta'],
-    value: 'username',
-    description: '''Sets logic to map the Subject Common Name field to a user
-                    in client TLS certificates.
-                    - username: Use the Subject CN field as a BMC username
-                                (default)
-                    - meta:     Parses the Subject CN in the format used by
+    choices: ['CommonName', 'Whole', 'UserPrincipalName', 'Meta'],
+    description: '''
+        Parses the Subject CN in the format used by
                                 Meta Inc (see mutual_tls_meta.cpp for details)
                     ''',
 )
 
 option(
+    'meta-tls-common-name-parsing',
+    type: 'feature',
+    description: '''
+        Allows parsing the Subject CN TLS certificate in the format used by
+                                Meta Inc (see mutual_tls_meta.cpp for details)
+    ''',
+)
+
+option(
     'ibm-management-console',
     type: 'feature',
     value: 'disabled',