diff --git a/patches/utils/patch_header.sh b/patches/utils/patch_header.sh
index 858f1183c520b056c32355072add76e90b033fa9..b38f69dfa5930e224784c88b7716377e649ce38b 100644
--- a/patches/utils/patch_header.sh
+++ b/patches/utils/patch_header.sh
@@ -109,24 +109,24 @@ then
  exit 1
 fi
 
-if [ -n "$LOGIN_PATH" ]; then
+if [ "$LOGIN_PATH" ]; then
   MYSQL_CONNECTION="--login-path=$LOGIN_PATH"
   MYSQL_CONNECTION_NO_DB="$MYSQL_CONNECTION"
   MYSQL_CONNECTION="$MYSQL_CONNECTION --database=$DATABASE_NAME"
 
-elif [ -z "$MYSQL_CONNECTION" ]; then
+elif [[ -z "$MYSQL_CONNECTION" ]]; then
   MYSQL_CONNECTION=""
-  if [ -n "$DATABASE_USER" ]
+  if [ "$DATABASE_USER" ]
   then
     MYSQL_CONNECTION="--user=$DATABASE_USER"
   fi
-  if [ -n "$DATABASE_USER_PW" ]
+  if [ "$DATABASE_USER_PW" ]
   then
     MYSQL_CONNECTION="$MYSQL_CONNECTION --password=$DATABASE_USER_PW"
   fi
   if [[ "$MYSQL_HOST" && ( "$MYSQL_HOST" != "localhost" ) ]]; then
       MYSQL_CONNECTION="$MYSQL_CONNECTION --host=$MYSQL_HOST"
-      if [ -n "$MYSQL_PORT" ]; then
+      if [ "$MYSQL_PORT" ]; then
           MYSQL_CONNECTION="$MYSQL_CONNECTION --port=$MYSQL_PORT"
       fi
   fi