diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp
index 0edd4c7d0423457aa189ec003ba3eb16b4b9e34d..eec1db0ea7cee3f7a94f2d874a4791deecf8e3a4 100755
--- a/src/freedombone-app-xmpp
+++ b/src/freedombone-app-xmpp
@@ -464,6 +464,14 @@ function update_prosody_modules {
         sed -i '/"pep";/a "s2s_blacklist"; -- Block bad domains' /etc/prosody/prosody.cfg.lua
         sed -i 's|"s2s_blacklist";|  "s2s_blacklist";|g' /etc/prosody/prosody.cfg.lua
     fi
+    if ! grep -q "s2s_blacklist" /etc/prosody/prosody.cfg.lua; then
+        sed -i '/"pep";/a "s2s_blacklist"; -- Block bad domains' /etc/prosody/prosody.cfg.lua
+        sed -i '/"muc_limits";/a "s2s_blacklist";' /etc/prosody/prosody.cfg.lua
+        sed -i 's|"s2s_blacklist";|  "s2s_blacklist";|g' /etc/prosody/prosody.cfg.lua
+    fi
+    if ! grep -q "vcard_muc" /etc/prosody/prosody.cfg.lua; then
+        sed -i '/"mam_muc";/a "vcard_muc";' /etc/prosody/prosody.cfg.lua
+    fi
 
     if ! grep -q "block_strangers" /etc/prosody/conf.avail/xmpp.cfg.lua; then
         sed -i '/"pep";/a "block_strangers"; -- Dont allow messages from strangers' /etc/prosody/conf.avail/xmpp.cfg.lua