diff --git a/appveyor.yml b/appveyor.yml
index b39530a0ef..228e8df576 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,7 +12,6 @@ stack: node 10
 
 install:
 - sh: npm i -g gulp
-- sh: echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 - cmd: choco install cloc --no-progress
 - cmd: "cloc --include-lang C#,SQL,Razor,\"Bourne Shell\",PowerShell,HTML,CSS,Sass,JavaScript,TypeScript --vcs git"
 
diff --git a/build-ci.sh b/build-ci.sh
index d07d770ea0..e0c0b1ccc2 100644
--- a/build-ci.sh
+++ b/build-ci.sh
@@ -15,10 +15,14 @@ fi
 echo "Prod deploy: ${PROD_DEPLOY}"
 echo "Tag name: ${TAG_NAME}"
 
-chmod +x ./build.sh
-
 #dotnet build --configuration Debug
 
+if [ "${DOCKER_USERNAME}" != "" -a "${DOCKER_PASSWORD}" != "" ]
+then
+    echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+fi
+
+chmod +x ./build.sh
 ./build.sh
 ./build.sh tag dev