diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix
index 7c06c281..3d926614 100755
--- a/src/freedombone-app-matrix
+++ b/src/freedombone-app-matrix
@@ -230,6 +230,8 @@ function matrix_configure_homeserver_yaml {
     sed -i "s|media_store_path:.*|media_store_path: \"${MATRIX_DATA_DIR}/media_store\"|g" "${filepath}"
     sed -i "s|pid_file:.*|pid_file: \"${MATRIX_DATA_DIR}/homeserver.pid\"|g" "${filepath}"
     sed -i "s|log_file:.*|log_file: \"/dev/null\"|g" "${filepath}"
+    sed -i '0,/bind_address:.*/s//bind_address: 127.0.0.1/' "${filepath}"
+    sed -i '0,/x_forwarded:.*/s//x_forwarded: true/' "${filepath}"
 }
 
 function matrix_configure_identityserver {
@@ -625,6 +627,7 @@ function install_matrix {
     pip install --upgrade pip
     pip install --upgrade python-ldap
     pip install --upgrade lxml
+    pip install --upgrade --force "pynacl==0.3.0"
 
     function_check install_home_server
     install_home_server