diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix
index c06f6281..91fd32f7 100755
--- a/src/freedombone-app-matrix
+++ b/src/freedombone-app-matrix
@@ -192,7 +192,7 @@ function matrix_generate_homeserver_file {
 function matrix_generate_identityserver_file {
     local filepath="${1}"
 
-    cd /etc/sydent/sydent
+    cd /etc/sydent
     python -m sydent.sydent \
            --config-path "${filepath}" \
            --generate-config \
@@ -540,6 +540,8 @@ function install_identity_server {
     if [ -d $INSTALL_DIR/sydent ]; then
         rm -rf $INSTALL_DIR/sydent/*
     fi
+    sed -i "s|8090|${MATRIX_ID_PORT}|g" /etc/sydent/sydent/sydent.py
+    python setup.py install
     pip install --upgrade --process-dependency-links . -b $INSTALL_DIR/sydent
     if [ ! "$?" = "0" ]; then
         echo $'Failed to install matrix identity server'
@@ -728,7 +730,7 @@ function install_matrix {
     function_check update_default_domain
     update_default_domain
 
-    pip install --upgrade --force "pynacl==0.3.0"
+    #pip install --upgrade --force "pynacl==0.3.0"
 
     function_check matrix_nginx
     matrix_nginx