diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp
index 38d86d37..e20c9883 100755
--- a/src/freedombone-app-xmpp
+++ b/src/freedombone-app-xmpp
@@ -642,6 +642,7 @@ function install_xmpp_main {
 
     prosodyctl register $MY_USERNAME $DEFAULT_DOMAIN_NAME "$XMPP_PASSWORD"
     if [ ! "$?" = "0" ]; then
+        remove_xmpp
         echo $'Unable to register prosody user'
         exit 347682
     fi
diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup
index 93bbdfb2..10a72c5f 100755
--- a/src/freedombone-utils-setup
+++ b/src/freedombone-utils-setup
@@ -515,10 +515,11 @@ function lockdown_permissions {
     if [ ! -d /var/lib/saned ]; then
         mkdir /var/lib/saned
     fi
-    if [ ! -d /etc/prosody ]; then
+    if [ -d /etc/prosody ]; then
         chown -R prosody /etc/prosody
+        chmod -R 700 /etc/prosody/conf.d
     fi
-    if [ ! -d /var/lib/prosody ]; then
+    if [ -d /var/lib/prosody ]; then
         chown -R prosody /var/lib/prosody
     fi
 }