diff --git a/entrypoint.sh b/entrypoint.sh
index 9375b14..e09daaf 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -2,13 +2,16 @@
 
 set -ex
 
+if [ -n "${PLUGIN_REGISTRY:-$ORG_REGISTRY}" ]; then
+  AUTH_FLAGS=--with-registry-auth
+fi
+
 if [ -n "$PLUGIN_PASSWORD" ]; then
   echo -n "$PLUGIN_PASSWORD" | \
     docker login \
       -u "$PLUGIN_USERNAME" \
       --password-stdin \
       ${PLUGIN_REGISTRY:-$ORG_REGISTRY}
-  AUTH_FLAGS=--with-registry-auth
 fi
 
 docker stack deploy \