diff --git a/init.sh b/init.sh
index 997fbd8..2325791 100755
--- a/init.sh
+++ b/init.sh
@@ -24,20 +24,20 @@ function wait_for_mysql {
 if [ ! -e /data/murmur.conf ]; then
 	echo Starting Initialization
 	cp /etc/murmur.conf /data/murmur.conf
-	if [ ! -z "$SERVER_PASSWORD" ] ; then write_config 'serverpassword=' "$SERVER_PASSWORD"; fi
-	if [ ! -z "$MAX_USERS" ] ; then write_config 'users' "$MAX_USERS"; fi
-	if [ ! -z "$SERVER_TEXT" ] ; then write_config 'welcometext=' "$SERVER_TEXT"; fi
-	if [ ! -z "$REGISTER_NAME" ] ; then write_config 'registerName=' "$REGISTER_NAME"; fi
-	if [ ! -z "$BANDWIDTH" ] ; then write_config 'bandwidth=' "$BANDWIDTH"; fi
+	write_config_if_else "$SERVER_PASSWORD" 'serverpassword' ''
+	write_config_if_else "$MAX_USERS" 'users' ''
+	write_config_if_else "$SERVER_TEXT" 'welcometext' ''
+	write_config_if_else "$REGISTER_NAME" 'registerName' ''
+	write_config_if_else "$BANDWIDTH" 'bandwidth' ''
 	if [ ! -z "$DATABASE" ] && [ "$DATABASE" == "MYSQL" ]; then 
 		if [ ! -z "$DB_NAME" ] && [ ! -z "$DB_HOST" ]; then
 			write_config 'dbdriver' 'QMYSQL'
 			write_config 'database' "$DB_NAME"
 			write_config 'dbhost' "$DB_HOST"
 			write_config_if_else "$DB_PORT" 'dbport' '3306'
-			write_config_if_else "$DB_USER" 'dbusername' ""
-			write_config_if_else "$DB_PASS" 'dbpassword' ""
-			write_config_if_else "$DB_PREFIX" 'dbprefix' ""
+			write_config_if_else "$DB_USER" 'dbusername' ''
+			write_config_if_else "$DB_PASS" 'dbpassword' ''
+			write_config_if_else "$DB_PREFIX" 'dbprefix' ''
 		else
 			echo "Insufficent Mysql configuration"
 			exit 1