diff --git a/src/bacnet-command.html b/src/bacnet-command.html
index c4bdc36..84d5bcc 100644
--- a/src/bacnet-command.html
+++ b/src/bacnet-command.html
@@ -188,7 +188,7 @@
     <div class="form-row">
         <label for="node-input-commandType" style="min-width:140px"><i class="fa fa-list"></i>
         <span data-i18n="bacnet-contrib.label.commandType"></span></label>
-        <select type="text" id="node-input-commandType">
+        <select type="text" id="node-input-commandType" style="min-width:55%">
             <option value="deviceCommunicationControl">Device Communication Control</option>
             <option value="reinitializeDevice">Reinitialize Device</option>
             <option value="timeSync">Time Sync</option>
diff --git a/src/bacnet-write.js b/src/bacnet-write.js
index 9e46506..47d66fe 100644
--- a/src/bacnet-write.js
+++ b/src/bacnet-write.js
@@ -68,7 +68,7 @@ module.exports = function (RED) {
         }]
 
         node.connector.client.writePropertyMultiple(
-          node.deviceIPAddress,
+          msg.payload.deviceIPAddress || node.deviceIPAddress,
           msg.payload.values || defaultValues,
           options,
           function (err, value) {