diff --git a/security/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Authentication.xml b/security/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Authentication.xml
index c12afa3b2..b9ac20dd2 100644
--- a/security/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Authentication.xml
+++ b/security/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Authentication.xml
@@ -8,7 +8,7 @@
             <Default>https://api.netbird.io:443</Default>
         </managementUrl>
         <setupKey type="TextField">
-            <Required>Y</Required>
+            <!-- XXX fails migration for obvious reasons <Required>Y</Required> -->
             <Mask>/^[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}$/i</Mask>
             <ValidationMessage>Please specify a valid setup key.</ValidationMessage>
         </setupKey>
diff --git a/security/netbird/src/opnsense/mvc/app/views/OPNsense/Netbird/settings.volt b/security/netbird/src/opnsense/mvc/app/views/OPNsense/Netbird/settings.volt
index 97bb7e39d..7c505a7a1 100644
--- a/security/netbird/src/opnsense/mvc/app/views/OPNsense/Netbird/settings.volt
+++ b/security/netbird/src/opnsense/mvc/app/views/OPNsense/Netbird/settings.volt
@@ -29,9 +29,8 @@
 
 <script>
     $(document).ready(() => {
-        mapDataToFormUI({
-            'frmSettings': "/api/netbird/settings/get"
-        }).done(() => {
+        mapDataToFormUI({'frmSettings': '/api/netbird/settings/get'}).done(() => {
+            $('.selectpicker').selectpicker('refresh');
             updateServiceControlUI('netbird');
         });