diff --git a/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php b/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php
index 7f771d774..d9846bbbe 100644
--- a/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php
+++ b/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php
@@ -295,6 +295,7 @@ class OpenVPN extends BaseModel
                     'vpnid' => (string)$node->vpnid,
                     'authmode' => (string)$node->authmode,
                     'local_group' => $local_group,
+                    'cso_login_matching' => (string)$node->username_as_common_name,
                     'strictusercn' => (string)$node->strictusercn,
                     'dev_mode' => (string)$node->dev_type,
                     'topology_subnet' => $node->topology == 'subnet' ? '1' : '0',
@@ -331,7 +332,7 @@ class OpenVPN extends BaseModel
                         'vpnid' => (string)$item->vpnid,
                         'authmode' => (string)$item->authmode,
                         'local_group' => (string)$item->local_group,
-                        'cso_login_matching' => (string)$item->username_as_common_name,
+                        'cso_login_matching' => (string)$item->{'use-common-name'},
                         'strictusercn' => (string)$item->strictusercn,
                         'dev_mode' => (string)$item->dev_mode,
                         'topology_subnet' => (string)$item->topology_subnet,