diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index b8a0062..d553c4b 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,10 +1,7 @@
 #!/bin/bash
 if [[ "$#" -eq 0 || "${1}" == "cqpserver" ]]; then
-  CQPSERVER_HOST="${CQPSERVER_HOST:-*}"
-  CQPSERVER_PASSWORD="${CQPSERVER_PASSWORD:-}"
-  CQPSERVER_USER="${CQPSERVER_USER:-anonymous}"
-  echo "host ${CQPSERVER_HOST};" > cqpserver.init
-  echo "user ${CQPSERVER_USER} \"${CQPSERVER_PASSWORD}\";" >> cqpserver.init
+  echo "host ${CQPSERVER_HOST:-*};" > cqpserver.init
+  echo "user ${CQPSERVER_USER:-anonymous} \"${CQPSERVER_PASSWORD:-}\";" >> cqpserver.init
 fi
 
 if [[ "$#" -eq 0 ]]; then