1 files changed, 3 insertions, 3 deletions
diff --git a/src/org/traccar/BaseProtocolEncoder.java b/src/org/traccar/BaseProtocolEncoder.java
index a9aa24cb0..3c2d08471 100644
--- a/src/org/traccar/BaseProtocolEncoder.java
+++ b/src/org/traccar/BaseProtocolEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2015 - 2016 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,8 +31,8 @@ public abstract class BaseProtocolEncoder extends OneToOneEncoder {
     protected void initDevicePassword(Command command, String defaultPassword) {
         if (!command.getAttributes().containsKey(Command.KEY_DEVICE_PASSWORD)) {
             Device device = Context.getIdentityManager().getDeviceById(command.getDeviceId());
-            if (device.getAttributes().containsKey(Command.KEY_DEVICE_PASSWORD)) {
-                String password = (String) device.getAttributes().get(Command.KEY_DEVICE_PASSWORD);
+            String password = device.getString(Command.KEY_DEVICE_PASSWORD);
+            if (password != null) {
                 command.set(Command.KEY_DEVICE_PASSWORD, password);
             } else {
                 command.set(Command.KEY_DEVICE_PASSWORD, defaultPassword);