diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp
index b3789158..a1b8773e 100755
--- a/src/freedombone-app-xmpp
+++ b/src/freedombone-app-xmpp
@@ -801,7 +801,7 @@ function install_xmpp {
         mkdir -p /var/lib/prosody/http_uploads
     fi
     if [ ! -d /etc/prosody/conf.d ]; then
-        mkdir /etc/prosody/conf.d
+        mkdir -p /etc/prosody/conf.d
     fi
 
     chmod -R 700 /etc/prosody/conf.d
@@ -845,11 +845,11 @@ function install_xmpp {
     cp -a /etc/prosody/conf.avail/example.com.cfg.lua /etc/prosody/conf.avail/xmpp.cfg.lua
 
     if [[ "$(cert_exists ${DEFAULT_DOMAIN_NAME} pem)" == "1" ]]; then
-        sed -i "s|key =.*|key = /etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key|g" /etc/prosody/conf.avail/xmpp.cfg.lua
-        sed -i "s|certificate =.*|certificate = /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem|g" /etc/prosody/conf.avail/xmpp.cfg.lua
+        sed -i "s|key =.*|key = /etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key;|g" /etc/prosody/conf.avail/xmpp.cfg.lua
+        sed -i "s|certificate =.*|certificate = /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem;|g" /etc/prosody/conf.avail/xmpp.cfg.lua
     else
-        sed -i "s|key =.*|key = /etc/ssl/privates/xmpp.key|g" /etc/prosody/conf.avail/xmpp.cfg.lua
-        sed -i "s|certificate =.*|certificate = /etc/ssl/certs/xmpp.crt|g" /etc/prosody/conf.avail/xmpp.cfg.lua
+        sed -i "s|key =.*|key = /etc/ssl/privates/xmpp.key;|g" /etc/prosody/conf.avail/xmpp.cfg.lua
+        sed -i "s|certificate =.*|certificate = /etc/ssl/certs/xmpp.crt;|g" /etc/prosody/conf.avail/xmpp.cfg.lua
     fi
     if ! grep -q "xmpp.dhparam" /etc/prosody/conf.avail/xmpp.cfg.lua; then
         if [[ "$(cert_exists ${DEFAULT_DOMAIN_NAME})" == "1" ]]; then