diff --git a/src/freedombone-app-movim b/src/freedombone-app-movim
index fe9c5080..29f1d7de 100755
--- a/src/freedombone-app-movim
+++ b/src/freedombone-app-movim
@@ -28,7 +28,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-VARIANTS='full full-vim chat'
+VARIANTS='full full-vim social'
 
 IN_DEFAULT_INSTALL=0
 SHOW_ON_ABOUT=1
@@ -225,8 +225,6 @@ function backup_remote_movim {
             function_check backup_database_to_friend
             backup_database_to_friend movim
 
-            echo $"Backing up GNU social installation"
-
             function_check backup_directory_to_friend
             backup_directory_to_friend $temp_backup_dir movim
 
@@ -260,6 +258,9 @@ function restore_remote_movim {
 }
 
 function remove_movim {
+    if [[ $(app_is_installed movim) == "0" ]]; then
+        return
+    fi
     read_config_param "MOVIM_DOMAIN_NAME"
     if [ ${#MOVIM_DOMAIN_NAME} -eq 0 ]; then
         return
@@ -298,6 +299,10 @@ function install_movim {
         exit 72572
     fi
 
+    if [[ $(app_is_installed xmpp) == "0" ]]; then
+        return
+    fi
+
     movim_hourly_script movim $MOVIM_DOMAIN_NAME
 
     function_check install_mariadb
diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp
index 1e7967e6..0db37425 100755
--- a/src/freedombone-app-xmpp
+++ b/src/freedombone-app-xmpp
@@ -498,6 +498,7 @@ function configure_firewall_for_xmpp {
 
 function remove_xmpp {
     remove_profanity
+    remove_movim
     firewall_remove 5222 tcp
     firewall_remove 5223 tcp
     firewall_remove 5269 tcp