diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp
index 12d5be38c055e4978f4359d7bba27aa6c72a6d4a..15c0ba5d1409fc4ace3af4140c2466bf73707b87 100755
--- a/src/freedombone-app-xmpp
+++ b/src/freedombone-app-xmpp
@@ -38,7 +38,7 @@ XMPP_CIPHERS='"EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA256:EECDH:+
 XMPP_ECC_CURVE='"secp384r1"'
 
 function reconfigure_xmpp {
-    echo -n ''
+	echo -n ''
 }
 
 function update_prosody_modules {
@@ -142,7 +142,11 @@ function restore_local_xmpp {
 }
 
 function backup_remote_xmpp {
-	echo -n ''
+	if [ -d /var/lib/prosody ]; then
+		echo $"Backing up the XMPP settings"
+		backup_directory_to_friend /var/lib/prosody xmpp
+		echo $"Backup of XMPP settings complete"
+	fi
 }
 
 function restore_remote_xmpp {
diff --git a/src/freedombone-backup-remote b/src/freedombone-backup-remote
index db2f0d4540f2faaaa9bf32aa164982e15af0ed7f..629299db44f91e8ddd1240d5bd0275177ff18b2c 100755
--- a/src/freedombone-backup-remote
+++ b/src/freedombone-backup-remote
@@ -258,13 +258,6 @@ function backup_mailing_list {
 	fi
 }
 
-function backup_xmpp {
-	if [ -d /var/lib/prosody ]; then
-		echo $"Backing up the XMPP settings"
-		backup_directory_to_friend /var/lib/prosody xmpp
-	fi
-}
-
 function backup_web_server {
 	if [ -d /etc/nginx ]; then
 		echo $"Backing up web settings"
@@ -470,7 +463,6 @@ if [[ $TEST_MODE == "no" ]]; then
 	backup_certs
 	backup_mailing_list
 
-	backup_xmpp
 	backup_ipfs
 	backup_dlna
 	backup_voip