diff --git a/CODEOWNERS b/CODEOWNERS
index b556fa80c41..5b91214dddf 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -333,7 +333,7 @@
 /bundles/org.openhab.binding.tr064/ @openhab/add-ons-maintainers
 /bundles/org.openhab.binding.tradfri/ @cweitkamp @kaikreuzer
 /bundles/org.openhab.binding.twitter/ @computergeek1507
-/bundles/org.openhab.binding.unifi/ @mgbowman
+/bundles/org.openhab.binding.unifi/ @mgbowman @Hilbrand
 /bundles/org.openhab.binding.unifiedremote/ @GiviMAD
 /bundles/org.openhab.binding.upb/ @marcusb
 /bundles/org.openhab.binding.upnpcontrol/ @mherwege
diff --git a/bundles/org.openhab.binding.unifi/README.md b/bundles/org.openhab.binding.unifi/README.md
index 3135eeed7ab..10cdc3782aa 100644
--- a/bundles/org.openhab.binding.unifi/README.md
+++ b/bundles/org.openhab.binding.unifi/README.md
@@ -199,15 +199,15 @@ Sending `ON` to this channel will trigger a reconnect via the controller.
 
 The `poePort` information that is retrieved is available as these channels:
 
-| Channel ID | Item Type                | Description                                        | Permissions |
-|------------|--------------------------|----------------------------------------------------|-------------|
-| online     | Switch                   | Online status of the port                          | Read        |
-| mode       | Selection                | Select the PoE mode: off, auto, 24v or passthrough | Read, Write |
-| enable     | Switch                   | Enable Power over Ethernet                         | Read, Write |
-| cmd        | String                   | Command channel: `power-cycle`: Power Cycle port   | Write       |
-| power      | Number:Power             | Power consumption of the port in Watt              | Read        |
-| voltage    | Number:ElectricPotential | Voltage of the port in Volt                        | Read        |
-| current    | Number:ElectricCurrent   | Current used by the port in mA                     | Read        |
+| Channel ID | Item Type                | Description                                           | Permissions |
+|------------|--------------------------|-------------------------------------------------------|-------------|
+| online     | Switch                   | Online status of the port                             | Read        |
+| mode       | Selection                | Select the PoE mode: off, auto, pasv24 or passthrough | Read, Write |
+| enable     | Switch                   | Enable Power over Ethernet                            | Read, Write |
+| cmd        | String                   | Command channel: `power-cycle`: Power Cycle port      | Write       |
+| power      | Number:Power             | Power consumption of the port in Watt                 | Read        |
+| voltage    | Number:ElectricPotential | Voltage of the port in Volt                           | Read        |
+| current    | Number:ElectricCurrent   | Current used by the port in mA                        | Read        |
 
 The `enable` switch channel has a configuration parameter `mode` which is the value used to switch PoE on when the channel is switched to ON.
 The default mode value is `auto`.
diff --git a/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/config/config.xml b/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/config/config.xml
index c09f56e7809..1d5cc7881ae 100644
--- a/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/config/config.xml
+++ b/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/config/config.xml
@@ -84,7 +84,7 @@
 			<description>The value to set when setting PoE on.</description>
 			<options>
 				<option value="auto">Auto</option>
-				<option value="24v">24V</option>
+				<option value="pasv24">24V</option>
 				<option value="passthrough">Passthrough</option>
 			</options>
 			<default>auto</default>
diff --git a/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/i18n/unifi.properties b/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/i18n/unifi.properties
index cc8e3d5c076..dd5f1bf1e19 100644
--- a/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/i18n/unifi.properties
+++ b/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/i18n/unifi.properties
@@ -82,7 +82,7 @@ channel-type.unifi.poeMode.label = PoE Mode
 channel-type.unifi.poeMode.description = The PoE mode the port is in
 channel-type.unifi.poeMode.state.option.off = Off
 channel-type.unifi.poeMode.state.option.auto = Auto
-channel-type.unifi.poeMode.state.option.24v = 24V
+channel-type.unifi.poeMode.state.option.pasv24 = 24V
 channel-type.unifi.poeMode.state.option.passthrough = Passthrough
 channel-type.unifi.poePower.label = Port PoE Power
 channel-type.unifi.poePower.description = Power usage of the PoE port
@@ -127,7 +127,7 @@ channel-type.unifi.wpaMode.description = WPA Mode of the Wi-Fi network
 channel-type.config.unifi.poeEnable.mode.label = On Mode
 channel-type.config.unifi.poeEnable.mode.description = The value to set when setting PoE on.
 channel-type.config.unifi.poeEnable.mode.option.auto = Auto
-channel-type.config.unifi.poeEnable.mode.option.24v = 24V
+channel-type.config.unifi.poeEnable.mode.option.pasv24v = 24V
 channel-type.config.unifi.poeEnable.mode.option.passthrough = Passthrough
 
 # status messages
diff --git a/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/thing/thing-types.xml
index 40f70b31828..c325c516567 100644
--- a/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/thing/thing-types.xml
@@ -341,7 +341,7 @@
 			<options>
 				<option value="off">Off</option>
 				<option value="auto">Auto</option>
-				<option value="24v">24V</option>
+				<option value="pasv24">24V</option>
 				<option value="passthrough">Passthrough</option>
 			</options>
 		</state>