diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index d70b87c..05845a9 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -78,18 +78,7 @@ echo "Create docker context"
 docker context create remote --docker "host=ssh://REMOTE_DOCKER_HOST"
 docker context use remote
 
-echo "[ -z "${INPUT_DOCKER_REGISTRY_USERNAME+x}" ]:"
-echo `[ -z "${INPUT_DOCKER_REGISTRY_USERNAME+x}" ]`
-echo "[ -z "${INPUT_DOCKER_REGISTRY_PASSWORD+x}" ]:"
-echo `[ -z "${INPUT_DOCKER_REGISTRY_PASSWORD+x}" ]`
-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
-if $DOCKER_REGISTRY_LOGIN ; then
+if [ $INPUT_DOCKER_REGISTRY_USERNAME ] && [ $INPUT_DOCKER_REGISTRY_PASSWORD ]; 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