diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index ebd6484..68b904c 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -78,17 +78,7 @@ echo "Create docker context"
 docker context create remote --docker "host=ssh://REMOTE_DOCKER_HOST"
 docker context use remote
 
-DOCKER_REGISTRY_LOGIN=true
-if [ -z "${INPUT_DOCKER_REGISTRY_USERNAME+x}" ]; then
-  DOCKER_REGISTRY_LOGIN=false
-fi
-if [ -z "${INPUT_DOCKER_REGISTRY_PASSWORD+x}" ]; then
-  DOCKER_REGISTRY_LOGIN=false
-fi
-echo "INPUT_DOCKER_REGISTRY_USERNAME: $INPUT_DOCKER_REGISTRY_USERNAME"
-echo "INPUT_DOCKER_REGISTRY_PASSWORD: $INPUT_DOCKER_REGISTRY_PASSWORD"
-echo "DOCKER_REGISTRY_LOGIN: $DOCKER_REGISTRY_LOGIN"
-if $DOCKER_REGISTRY_LOGIN ; then
+if ! [ "x${INPUT_DOCKER_REGISTRY_USERNAME}"=="x" ] && ! [ "x${INPUT_DOCKER_REGISTRY_PASSWORD}"=="x" ]; then
   echo "Connecting to $INPUT_DOCKER_REGISTRY_URI... Command: docker login"
   echo "$INPUT_DOCKER_REGISTRY_PASSWORD" | docker login -u "$INPUT_DOCKER_REGISTRY_USERNAME" --password-stdin "$INPUT_DOCKER_REGISTRY_URI"
 fi