diff --git a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/session/type/AMQPSession.java b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/session/type/AMQPSession.java
index e06810a..e489f32 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/session/type/AMQPSession.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/session/type/AMQPSession.java
@@ -104,9 +104,9 @@
           factory.setUsername(amqp.username);
         }
         Gerrit gerrit = properties.getSection(Gerrit.class);
-        String securePassword = gerrit.getAMQPUserPassword(amqp.username);
-        if (StringUtils.isNotEmpty(securePassword)) {
-          factory.setPassword(securePassword);
+        String password = gerrit.getAMQPUserPassword(amqp.username);
+        if (StringUtils.isNotEmpty(password)) {
+          factory.setPassword(password);
         } else if (StringUtils.isNotEmpty(amqp.password)) {
           factory.setPassword(amqp.password);
         }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/session/type/StreamSession.java b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/session/type/StreamSession.java
index 8cf282a..74595e7 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/session/type/StreamSession.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/session/type/StreamSession.java
@@ -58,9 +58,9 @@
       builder.username(amqp.username);
     }
     Gerrit gerrit = properties.getSection(Gerrit.class);
-    String securePassword = gerrit.getAMQPUserPassword(amqp.username);
-    if (StringUtils.isNotEmpty(securePassword)) {
-      builder.password(securePassword);
+    String password = gerrit.getAMQPUserPassword(amqp.username);
+    if (StringUtils.isNotEmpty(password)) {
+      builder.password(password);
     } else if (StringUtils.isNotEmpty(amqp.password)) {
       builder.password(amqp.password);
     }
