diff --git a/src/freedombone-app-babel b/src/freedombone-app-babel
index 6cc383c2..b8929b75 100755
--- a/src/freedombone-app-babel
+++ b/src/freedombone-app-babel
@@ -34,15 +34,23 @@ ENABLE_BABEL="no"
 BABEL_PORT=6696
 
 function upgrade_babel {
-    echo ''
+    echo -n ''
 }
 
 function backup_local_babel {
-    echo ''
+    echo -n ''
+}
+
+function restore_local_babel {
+    echo -n ''
 }
 
 function backup_remote_babel {
-    echo ''
+    echo -n ''
+}
+
+function restore_remote_babel {
+    echo -n ''
 }
 
 function remove_babel {
diff --git a/src/freedombone-app-batman b/src/freedombone-app-batman
index d259c2d0..9083b4cf 100755
--- a/src/freedombone-app-batman
+++ b/src/freedombone-app-batman
@@ -47,15 +47,23 @@ function configure_firewall_for_batma {
 }
 
 function upgrade_batman {
-    echo ''
+    echo -n ''
 }
 
 function backup_local_batman {
-    echo ''
+    echo -n ''
+}
+
+function restore_local_batman {
+    echo -n ''
 }
 
 function backup_remote_batman {
-    echo ''
+    echo -n ''
+}
+
+function restore_remote_batman {
+    echo -n ''
 }
 
 function remove_batman {
diff --git a/src/freedombone-app-emacs b/src/freedombone-app-emacs
index 2f6db08d..9b1c2f2e 100755
--- a/src/freedombone-app-emacs
+++ b/src/freedombone-app-emacs
@@ -38,10 +38,18 @@ function backup_local_emacs {
 	echo -n ''
 }
 
+function restore_local_emacs {
+	echo -n ''
+}
+
 function backup_remote_emacs {
 	echo -n ''
 }
 
+function restore_remote_emacs {
+	echo -n ''
+}
+
 function remove_emacs {
 	if ! grep -Fxq "install_emacs" $COMPLETION_FILE; then
 		return
diff --git a/src/freedombone-app-irc b/src/freedombone-app-irc
index e618f207..103695cc 100755
--- a/src/freedombone-app-irc
+++ b/src/freedombone-app-irc
@@ -44,10 +44,18 @@ function backup_local_irc {
 	echo -n ''
 }
 
+function restore_local_irc {
+	echo -n ''
+}
+
 function backup_remote_irc {
 	echo -n ''
 }
 
+function restore_remote_irc {
+	echo -n ''
+}
+
 function remove_irc {
 	if ! grep -Fxq "install_irc" $COMPLETION_FILE; then
 		return
diff --git a/src/freedombone-app-searx b/src/freedombone-app-searx
index a201b191..c65d3e19 100755
--- a/src/freedombone-app-searx
+++ b/src/freedombone-app-searx
@@ -67,10 +67,18 @@ function backup_local_searx {
 	echo -n ''
 }
 
+function restore_local_searx {
+	echo -n ''
+}
+
 function backup_remote_searx {
 	echo -n ''
 }
 
+function restore_remote_searx {
+	echo -n ''
+}
+
 function remove_searx {
 	if ! grep -Fxq "install_searx" $COMPLETION_FILE; then
 		return
diff --git a/src/freedombone-app-vpn b/src/freedombone-app-vpn
index 90e50114..2296843f 100755
--- a/src/freedombone-app-vpn
+++ b/src/freedombone-app-vpn
@@ -38,10 +38,18 @@ function backup_local_vpn {
 	echo -n ''
 }
 
+function restore_local_vpn {
+	echo -n ''
+}
+
 function backup_remote_vpn {
 	echo -n ''
 }
 
+function restore_remote_vpn {
+	echo -n ''
+}
+
 function remove_vpn {
 	apt-get -y remove --purge fastd
 	sed -i '/install_vpn/d' $COMPLETION_FILE
diff --git a/src/freedombone-app-webmail b/src/freedombone-app-webmail
index 3f7c03b5..c2a6431c 100755
--- a/src/freedombone-app-webmail
+++ b/src/freedombone-app-webmail
@@ -47,6 +47,9 @@ function upgrade_webmail {
 }
 
 function backup_local_webmail {
+	if ! grep -q "install_webmail" $COMPLETION_FILE; then
+		return
+	fi
 	echo $"Backing up webmail"
 
 	function_check backup_database_to_usb
@@ -55,10 +58,26 @@ function backup_local_webmail {
 	echo $"Backing up webmail complete"
 }
 
+function restore_local_webmail {
+	if ! grep -q "install_webmail" $COMPLETION_FILE; then
+		return
+	fi
+	echo $"Restoring webmail"
+
+	function_check restore_database
+	restore_database webmail
+
+	echo $"Restore of webmail complete"
+}
+
 function backup_remote_webmail {
 	echo -n ''
 }
 
+function restore_remote_webmail {
+	echo -n ''
+}
+
 function remove_webmail {
 	if ! grep -Fxq "install_webmail" $COMPLETION_FILE; then
 		return
diff --git a/src/freedombone-app-zeronet b/src/freedombone-app-zeronet
index 8ec6127d..a8e6dce8 100755
--- a/src/freedombone-app-zeronet
+++ b/src/freedombone-app-zeronet
@@ -59,11 +59,19 @@ function upgrade_zeronet {
 }
 
 function backup_local_zeronet {
-	echo ''
+	echo -n ''
+}
+
+function restore_local_zeronet {
+	echo -n ''
 }
 
 function backup_remote_zeronet {
-	echo ''
+	echo -n ''
+}
+
+function restore_remote_zeronet {
+	echo -n ''
 }
 
 function remove_zeronet_blog {