diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/OptionField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/OptionField.php
index 0771635e6b..2b8eb1e4ed 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/OptionField.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/OptionField.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (C) 2015-2019 Deciso B.V.
+ * Copyright (C) 2015-2026 Deciso B.V.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,12 +45,12 @@ class OptionField extends BaseListField
             // copy options to internal structure, make sure we don't copy in array structures
             foreach ($data as $key => $value) {
                 if (!is_array($value)) {
-                    $this->internalOptionList[$key] = gettext($value);
+                    $this->internalOptionList[$key] = strlen($value) ? gettext($value) : $key;
                 } else {
                     foreach ($value as $subkey => $subval) {
                         $this->internalOptionList[$subkey] = [
+                            'value' => strlen($subval) ? gettext($subval) : $key,
                             'optgroup' => gettext($key),
-                            'value' => $subval,
                         ];
                     }
                 }
diff --git a/src/opnsense/mvc/app/models/OPNsense/Firewall/Alias.xml b/src/opnsense/mvc/app/models/OPNsense/Firewall/Alias.xml
index 59400d40b6..da0b3ea1b8 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Firewall/Alias.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Firewall/Alias.xml
@@ -50,8 +50,8 @@
                 <proto type="OptionField">
                     <Multiple>Y</Multiple>
                     <OptionValues>
-                        <IPv4>IPv4</IPv4>
-                        <IPv6>IPv6</IPv6>
+                        <IPv4/>
+                        <IPv6/>
                     </OptionValues>
                 </proto>
                 <interface type="InterfaceField">
@@ -73,9 +73,9 @@
                 <username type="TextField"/>
                 <authtype type="OptionField">
                     <OptionValues>
-                        <Basic>Basic</Basic>
-                        <Bearer>Bearer</Bearer>
-                        <Header>Header</Header>
+                        <Basic/>
+                        <Bearer/>
+                        <Header/>
                     </OptionValues>
                 </authtype>
                 <expire type="IntegerField">