2 files changed, 15 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/TotemProtocolEncoder.java b/src/org/traccar/protocol/TotemProtocolEncoder.java
index 51d6fec1e..1c870f63c 100644
--- a/src/org/traccar/protocol/TotemProtocolEncoder.java
+++ b/src/org/traccar/protocol/TotemProtocolEncoder.java
@@ -16,17 +16,23 @@
  */
 package org.traccar.protocol;
 
+import org.traccar.Context;
 import org.traccar.StringProtocolEncoder;
 import org.traccar.helper.Log;
 import org.traccar.model.Command;
+import org.traccar.model.Device;
 
 public class TotemProtocolEncoder extends StringProtocolEncoder {
 
     @Override
     protected Object encodeCommand(Command command) {
 
-        // Temporary put default password
         command.set(Command.KEY_DEVICE_PASSWORD, "000000");
+        Device device = Context.getIdentityManager().getDeviceById(command.getDeviceId());
+        if (device.getAttributes().containsKey(Command.KEY_DEVICE_PASSWORD)) {
+            command.set(Command.KEY_DEVICE_PASSWORD, (String) device.getAttributes()
+                    .get(Command.KEY_DEVICE_PASSWORD));
+        }
 
         switch (command.getType()) {
             //Assuming PIN 8 (Output C) is the power wire, like manual says but it can be PIN 5,7,8
diff --git a/src/org/traccar/protocol/WondexProtocolEncoder.java b/src/org/traccar/protocol/WondexProtocolEncoder.java
index 9d000d9ea..568ca6aa0 100644
--- a/src/org/traccar/protocol/WondexProtocolEncoder.java
+++ b/src/org/traccar/protocol/WondexProtocolEncoder.java
@@ -1,15 +1,21 @@
 package org.traccar.protocol;
 
+import org.traccar.Context;
 import org.traccar.StringProtocolEncoder;
 import org.traccar.helper.Log;
-import org.traccar.model.Command;;
+import org.traccar.model.Command;
+import org.traccar.model.Device;
 
 public class WondexProtocolEncoder extends StringProtocolEncoder {
     @Override
     protected Object encodeCommand(Command command) {
 
-        // Temporary put default password
         command.set(Command.KEY_DEVICE_PASSWORD, "0000");
+        Device device = Context.getIdentityManager().getDeviceById(command.getDeviceId());
+        if (device.getAttributes().containsKey(Command.KEY_DEVICE_PASSWORD)) {
+            command.set(Command.KEY_DEVICE_PASSWORD, (String) device.getAttributes()
+                    .get(Command.KEY_DEVICE_PASSWORD));
+        }
 
         switch (command.getType()) {
         case Command.TYPE_REBOOT_DEVICE: