diff --git a/libnymea-zigbee/backends/nxp/zigbeebridgecontrollernxp.cpp b/libnymea-zigbee/backends/nxp/zigbeebridgecontrollernxp.cpp
index 58cbd86..925bfc5 100644
--- a/libnymea-zigbee/backends/nxp/zigbeebridgecontrollernxp.cpp
+++ b/libnymea-zigbee/backends/nxp/zigbeebridgecontrollernxp.cpp
@@ -328,7 +328,7 @@ ZigbeeInterfaceNxpReply *ZigbeeBridgeControllerNxp::requestEnqueueSendDataGroup(
     payloadStream << profileId;
     payloadStream << clusterId;
     payloadStream << sourceEndpoint;
-    payloadStream << static_cast<quint8>(SecurityModeUnsecure);
+    payloadStream << static_cast<quint8>(txOptions);
     payloadStream << radius;
     payloadStream << static_cast<quint16>(asdu.size());
     for (int i = 0; i < asdu.size(); i++) {
@@ -364,7 +364,7 @@ ZigbeeInterfaceNxpReply *ZigbeeBridgeControllerNxp::requestEnqueueSendDataShortA
     payloadStream << profileId;
     payloadStream << clusterId;
     payloadStream << sourceEndpoint;
-    payloadStream << static_cast<quint8>(SecurityModeUnsecure);
+    payloadStream << static_cast<quint8>(txOptions);
     payloadStream << radius;
     payloadStream << static_cast<quint16>(asdu.size());
     for (int i = 0; i < asdu.size(); i++) {
@@ -400,7 +400,7 @@ ZigbeeInterfaceNxpReply *ZigbeeBridgeControllerNxp::requestEnqueueSendDataIeeeAd
     payloadStream << profileId;
     payloadStream << clusterId;
     payloadStream << sourceEndpoint;
-    payloadStream << static_cast<quint8>(SecurityModeUnsecure);
+    payloadStream << static_cast<quint8>(txOptions);
     payloadStream << radius;
     payloadStream << static_cast<quint16>(asdu.size());
     for (int i = 0; i < asdu.size(); i++) {
diff --git a/libnymea-zigbee/backends/nxp/zigbeenetworknxp.cpp b/libnymea-zigbee/backends/nxp/zigbeenetworknxp.cpp
index 2cf43cb..98854d9 100644
--- a/libnymea-zigbee/backends/nxp/zigbeenetworknxp.cpp
+++ b/libnymea-zigbee/backends/nxp/zigbeenetworknxp.cpp
@@ -225,12 +225,12 @@ ZigbeeNetworkReply *ZigbeeNetworkNxp::requestSetPermitJoin(quint16 shortAddress,
     // Get the power descriptor
     ZigbeeNetworkRequest request;
     request.setRequestId(generateSequenceNumber());
-    request.setDestinationAddressMode(Zigbee::DestinationAddressModeGroup);
+    request.setDestinationAddressMode(Zigbee::DestinationAddressModeShortAddress);
     request.setDestinationShortAddress(static_cast<quint16>(shortAddress));
     request.setProfileId(Zigbee::ZigbeeProfileDevice); // ZDP
     request.setClusterId(ZigbeeDeviceProfile::MgmtPermitJoinRequest);
     request.setSourceEndpoint(0); // ZDO
-    request.setRadius(0);
+    request.setRadius(10);
 
     // Build ASDU
     QByteArray asdu;