diff --git a/entrypoint.sh b/entrypoint.sh
index 01a25bb..f68ce64 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -10,14 +10,16 @@ ln -s /config/ownsettings.php /var/www/spotweb/ownsettings.php
 
 chown -R www-data:www-data /var/www/spotweb
 
-if [[ -n "$SPOTWEB_DB_TYPE" && -n "$SPOTWEB_DB_HOST" && -n "$SPOTWEB_DB_NAME" && -n "$SPOTWEB_DB_USER" && -n "$SPOTWEB_DB_PASS" ]]; then
+if [[ -n "$SPOTWEB_DB_TYPE" && -n "$SPOTWEB_DB_HOST" && -n "$SPOTWEB_DB_NAME" && -n "$SPOTWEB_DB_USER" ]]; then
     echo "Creating database configuration"
     echo "<?php" > /config/dbsettings.inc.php
     echo "\$dbsettings['engine'] = '$SPOTWEB_DB_TYPE';" >> /config/dbsettings.inc.php
     echo "\$dbsettings['host'] = '$SPOTWEB_DB_HOST';" >> /config/dbsettings.inc.php
     echo "\$dbsettings['dbname'] = '$SPOTWEB_DB_NAME';"  >> /config/dbsettings.inc.php
     echo "\$dbsettings['user'] = '$SPOTWEB_DB_USER';" >> /config/dbsettings.inc.php
-    echo "\$dbsettings['pass'] = '$SPOTWEB_DB_PASS';"  >> /config/dbsettings.inc.php
+    if [[ -n "$SPOTWEB_DB_PASS" ]]; then
+    	echo "\$dbsettings['pass'] = '$SPOTWEB_DB_PASS';"  >> /config/dbsettings.inc.php
+    fi
 fi
 
 if [[ -n "$SPOTWEB_DB_PORT" ]]; then