diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix
index 63d663d6..3ef4a1d7 100755
--- a/src/freedombone-app-matrix
+++ b/src/freedombone-app-matrix
@@ -235,7 +235,7 @@ function matrix_configure_homeserver_yaml {
     mv ${ymltemp} "${filepath}"
 
     sed -i 's|no_tls: .*|no_tls: False|g' "${filepath}"
-    sed -i 's| tls: .*| tls: True|g' "${filepath}"
+    sed -i ':a;N;$!ba;s/ tls: [^\n]*/ tls: False/2' "${filepath}"
     sed -i 's|enable_registration_captcha.*|enable_registration_captcha: False|g' "${filepath}"
     sed -i "s|database: \".*|database: \"${MATRIX_DATA_DIR}/homeserver.db\"|g" "${filepath}"
     sed -i "s|media_store_path:.*|media_store_path: \"${MATRIX_DATA_DIR}/media_store\"|g" "${filepath}"
@@ -665,6 +665,7 @@ function install_home_server {
 
     groupadd matrix
     useradd -c "Matrix system account" -d $MATRIX_DATA_DIR -m -r -g matrix matrix
+    usermod -a -G www-data matrix
 
     function_check install_turn
     install_turn