diff --git a/src/freedombone-restore-local b/src/freedombone-restore-local
index e7f6ad61..ed9ff6c8 100755
--- a/src/freedombone-restore-local
+++ b/src/freedombone-restore-local
@@ -51,9 +51,9 @@ USB_MOUNT=/mnt/usb
 # get default USB from config file
 CONFIG_FILE=$HOME/${PROJECT_NAME}.cfg
 if [ -f $CONFIG_FILE ]; then
-	if grep -q "USB_DRIVE=" $CONFIG_FILE; then
-		USB_DRIVE=$(cat $CONFIG_FILE | grep "USB_DRIVE=" | awk -F '=' '{print $2}')
-	fi
+    if grep -q "USB_DRIVE=" $CONFIG_FILE; then
+        USB_DRIVE=$(cat $CONFIG_FILE | grep "USB_DRIVE=" | awk -F '=' '{print $2}')
+    fi
 fi
 
 # get the version of Go being used
@@ -63,635 +63,635 @@ GVM_HOME=$(cat /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-go | grep
 ADMIN_USERNAME=''
 ADMIN_NAME=
 if [ -f $COMPLETION_FILE ]; then
-	ADMIN_USERNAME=$(cat $COMPLETION_FILE | grep "Admin user" | awk -F ':' '{print $2}')
+    ADMIN_USERNAME=$(cat $COMPLETION_FILE | grep "Admin user" | awk -F ':' '{print $2}')
 fi
 
 # MariaDB password
 DATABASE_PASSWORD=$(cat /root/dbpass)
 
 function check_backup_exists {
-	if [ ! -d $USB_MOUNT/backup ]; then
-		echo $"No backup directory found on the USB drive."
-		set_user_permissions
-		backup_unmount_drive
-		exit 2
-	fi
+    if [ ! -d $USB_MOUNT/backup ]; then
+        echo $"No backup directory found on the USB drive."
+        set_user_permissions
+        backup_unmount_drive
+        exit 2
+    fi
 }
 
 function check_admin_user {
-	echo $"Checking that admin user exists"
-	if [ ! -d /home/$ADMIN_USERNAME ]; then
-		echo $"Username $ADMIN_USERNAME not found. Reinstall ${PROJECT_NAME} with this username."
-		set_user_permissions
-		backup_unmount_drive
-		exit 295
-	fi
+    echo $"Checking that admin user exists"
+    if [ ! -d /home/$ADMIN_USERNAME ]; then
+        echo $"Username $ADMIN_USERNAME not found. Reinstall ${PROJECT_NAME} with this username."
+        set_user_permissions
+        backup_unmount_drive
+        exit 295
+    fi
 }
 
 function copy_gpg_keys {
-	echo $"Copying GPG keys from admin user to root"
-	cp -r /home/$ADMIN_USERNAME/.gnupg /root
+    echo $"Copying GPG keys from admin user to root"
+    cp -r /home/$ADMIN_USERNAME/.gnupg /root
 }
 
 function restore_directory_from_usb {
-	if [ ! -d ${1} ]; then
-		mkdir ${1}
-	fi
-	obnam restore -r $USB_MOUNT/backup/${2} --to ${1}
+    if [ ! -d ${1} ]; then
+        mkdir ${1}
+    fi
+    obnam restore -r $USB_MOUNT/backup/${2} --to ${1}
 }
 
 function restore_configuration {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'configuration' ]]; then
-			return
-		fi
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'configuration' ]]; then
+            return
+        fi
+    fi
 
-	# this restores *.cfg and COMPLETION_FILE
-	if [ -d $USB_MOUNT/backup/config ]; then
-		echo $"Restoring configuration files"
-		temp_restore_dir=/root/tempconfig
-		restore_directory_from_usb $temp_restore_dir config
+    # this restores *.cfg and COMPLETION_FILE
+    if [ -d $USB_MOUNT/backup/config ]; then
+        echo $"Restoring configuration files"
+        temp_restore_dir=/root/tempconfig
+        restore_directory_from_usb $temp_restore_dir config
 
-		cp -f $temp_restore_dir/root/${PROJECT_NAME}.cfg $CONFIG_FILE
-		if [ ! "$?" = "0" ]; then
-			set_user_permissions
-			backup_unmount_drive
-			rm -rf $temp_restore_dir
-			exit 5294
-		fi
-		if [ -f $CONFIG_FILE ]; then
-			# install according to the config file
-			freedombone -c $CONFIG_FILE
-		fi
+        cp -f $temp_restore_dir/root/${PROJECT_NAME}.cfg $CONFIG_FILE
+        if [ ! "$?" = "0" ]; then
+            set_user_permissions
+            backup_unmount_drive
+            rm -rf $temp_restore_dir
+            exit 5294
+        fi
+        if [ -f $CONFIG_FILE ]; then
+            # install according to the config file
+            freedombone -c $CONFIG_FILE
+        fi
 
-		cp -f $temp_restore_dir/root/${PROJECT_NAME}-completed.txt $COMPLETION_FILE
-		if [ ! "$?" = "0" ]; then
-			set_user_permissions
-			backup_unmount_drive
-			rm -rf $temp_restore_dir
-			exit 6382
-		fi
+        cp -f $temp_restore_dir/root/${PROJECT_NAME}-completed.txt $COMPLETION_FILE
+        if [ ! "$?" = "0" ]; then
+            set_user_permissions
+            backup_unmount_drive
+            rm -rf $temp_restore_dir
+            exit 6382
+        fi
 
-		if [ -f ${temp_restore_dir}${BACKUP_EXTRA_DIRECTORIES} ]; then
-			cp -f ${temp_restore_dir}${BACKUP_EXTRA_DIRECTORIES} ${BACKUP_EXTRA_DIRECTORIES}
-			if [ ! "$?" = "0" ]; then
-				set_user_permissions
-				backup_unmount_drive
-				rm -rf $temp_restore_dir
-				exit 62121
-			fi
-		fi
+        if [ -f ${temp_restore_dir}${BACKUP_EXTRA_DIRECTORIES} ]; then
+            cp -f ${temp_restore_dir}${BACKUP_EXTRA_DIRECTORIES} ${BACKUP_EXTRA_DIRECTORIES}
+            if [ ! "$?" = "0" ]; then
+                set_user_permissions
+                backup_unmount_drive
+                rm -rf $temp_restore_dir
+                exit 62121
+            fi
+        fi
 
-		# restore nginx password hashes
-		if [ -f $temp_restore_dir/root/htpasswd ]; then
-			cp -f $temp_restore_dir/root/htpasswd /etc/nginx/.htpasswd
-		fi
+        # restore nginx password hashes
+        if [ -f $temp_restore_dir/root/htpasswd ]; then
+            cp -f $temp_restore_dir/root/htpasswd /etc/nginx/.htpasswd
+        fi
 
-		rm -rf $temp_restore_dir
-	fi
+        rm -rf $temp_restore_dir
+    fi
 }
 
 function same_admin_user {
-	PREV_ADMIN_USERNAME=$(cat $COMPLETION_FILE | grep "Admin user" | awk -F ':' '{print $2}')
-	if [[ "$PREV_ADMIN_USERNAME" != "$ADMIN_USERNAME" ]]; then
-		echo $"The admin username has changed from $PREV_ADMIN_USERNAME to $ADMIN_USERNAME. To restore you will first need to install a new ${PROJECT_NAME} system with an initial admin user named $PREV_ADMIN_USERNAME"
-		set_user_permissions
-		backup_unmount_drive
-		exit 73265
-	fi
+    PREV_ADMIN_USERNAME=$(cat $COMPLETION_FILE | grep "Admin user" | awk -F ':' '{print $2}')
+    if [[ "$PREV_ADMIN_USERNAME" != "$ADMIN_USERNAME" ]]; then
+        echo $"The admin username has changed from $PREV_ADMIN_USERNAME to $ADMIN_USERNAME. To restore you will first need to install a new ${PROJECT_NAME} system with an initial admin user named $PREV_ADMIN_USERNAME"
+        set_user_permissions
+        backup_unmount_drive
+        exit 73265
+    fi
 }
 
 function restore_mariadb {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'mariadb' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/mariadb ]; then
-		echo $"Restoring mysql settings"
-		temp_restore_dir=/root/tempmariadb
-		restore_directory_from_usb $temp_restore_dir mariadb
-		echo $"Get the MariaDB password from the backup"
-		if [ ! -f ${temp_restore_dir}${temp_restore_dir}/db ]; then
-			echo $"MariaDB password file not found"
-			exit 495
-		fi
-		BACKUP_MARIADB_PASSWORD=$(cat ${temp_restore_dir}${temp_restore_dir}/db)
-		if [[ $BACKUP_MARIADB_PASSWORD != $DATABASE_PASSWORD ]]; then
-			echo $"Restore the MariaDB user table"
-			mysqlsuccess=$(mysql -u root --password=$DATABASE_PASSWORD mysql -o < ${temp_restore_dir}${temp_restore_dir}/mysql.sql)
-			if [ ! "$?" = "0" ]; then
-				echo $"Try again using the password obtained from backup"
-				mysqlsuccess=$(mysql -u root --password=$BACKUP_MARIADB_PASSWORD mysql -o < ${temp_restore_dir}${temp_restore_dir}/mysql.sql)
-			fi
-			if [ ! "$?" = "0" ]; then
-				echo "$mysqlsuccess"
-				set_user_permissions
-				backup_unmount_drive
-				exit 962
-			fi
-			echo $"Restarting database"
-			service mysql restart
-			echo $"Change the MariaDB password to the backup version"
-			DATABASE_PASSWORD=$BACKUP_MARIADB_PASSWORD
-		fi
-		shred -zu ${temp_restore_dir}${temp_restore_dir}/db
-		rm -rf $temp_restore_dir
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'mariadb' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/mariadb ]; then
+        echo $"Restoring mysql settings"
+        temp_restore_dir=/root/tempmariadb
+        restore_directory_from_usb $temp_restore_dir mariadb
+        echo $"Get the MariaDB password from the backup"
+        if [ ! -f ${temp_restore_dir}${temp_restore_dir}/db ]; then
+            echo $"MariaDB password file not found"
+            exit 495
+        fi
+        BACKUP_MARIADB_PASSWORD=$(cat ${temp_restore_dir}${temp_restore_dir}/db)
+        if [[ $BACKUP_MARIADB_PASSWORD != $DATABASE_PASSWORD ]]; then
+            echo $"Restore the MariaDB user table"
+            mysqlsuccess=$(mysql -u root --password=$DATABASE_PASSWORD mysql -o < ${temp_restore_dir}${temp_restore_dir}/mysql.sql)
+            if [ ! "$?" = "0" ]; then
+                echo $"Try again using the password obtained from backup"
+                mysqlsuccess=$(mysql -u root --password=$BACKUP_MARIADB_PASSWORD mysql -o < ${temp_restore_dir}${temp_restore_dir}/mysql.sql)
+            fi
+            if [ ! "$?" = "0" ]; then
+                echo "$mysqlsuccess"
+                set_user_permissions
+                backup_unmount_drive
+                exit 962
+            fi
+            echo $"Restarting database"
+            service mysql restart
+            echo $"Change the MariaDB password to the backup version"
+            DATABASE_PASSWORD=$BACKUP_MARIADB_PASSWORD
+        fi
+        shred -zu ${temp_restore_dir}${temp_restore_dir}/db
+        rm -rf $temp_restore_dir
 
-		# Change database password file
-		echo "$DATABASE_PASSWORD" > /root/dbpass
-		chmod 600 /root/dbpass
-	fi
+        # Change database password file
+        echo "$DATABASE_PASSWORD" > /root/dbpass
+        chmod 600 /root/dbpass
+    fi
 }
 
 function restore_letsencrypt {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'letsencrypt' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/letsencrypt ]; then
-		echo $"Restoring Lets Encrypt settings"
-		restore_directory_from_usb / letsencrypt
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'letsencrypt' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/letsencrypt ]; then
+        echo $"Restoring Lets Encrypt settings"
+        restore_directory_from_usb / letsencrypt
+    fi
 }
 
 function restore_tor {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'tor' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/tor ]; then
-		echo $"Restoring Tor settings"
-		restore_directory_from_usb / tor
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'tor' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/tor ]; then
+        echo $"Restoring Tor settings"
+        restore_directory_from_usb / tor
+    fi
 }
 
 function restore_mutt_settings {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'mutt' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/mutt ]; then
-		for d in $USB_MOUNT/backup/mutt/*/ ; do
-			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring Mutt settings for $USERNAME"
-				temp_restore_dir=/root/tempmutt
-				restore_directory_from_usb $temp_restore_dir mutt/$USERNAME
-				if [ -f $temp_restore_dir/home/$USERNAME/tempbackup/.muttrc ]; then
-					cp -f $temp_restore_dir/home/$USERNAME/tempbackup/.muttrc /home/$USERNAME/.muttrc
-				fi
-				if [ -f $temp_restore_dir/home/$USERNAME/tempbackup/Muttrc ]; then
-					cp -f $temp_restore_dir/home/$USERNAME/tempbackup/Muttrc /etc/Muttrc
-				fi
-				if [ ! "$?" = "0" ]; then
-					rm -rf $temp_restore_dir
-					set_user_permissions
-					backup_unmount_drive
-					exit 276
-				fi
-				rm -rf $temp_restore_dir
-			fi
-		done
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'mutt' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/mutt ]; then
+        for d in $USB_MOUNT/backup/mutt/*/ ; do
+            USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring Mutt settings for $USERNAME"
+                temp_restore_dir=/root/tempmutt
+                restore_directory_from_usb $temp_restore_dir mutt/$USERNAME
+                if [ -f $temp_restore_dir/home/$USERNAME/tempbackup/.muttrc ]; then
+                    cp -f $temp_restore_dir/home/$USERNAME/tempbackup/.muttrc /home/$USERNAME/.muttrc
+                fi
+                if [ -f $temp_restore_dir/home/$USERNAME/tempbackup/Muttrc ]; then
+                    cp -f $temp_restore_dir/home/$USERNAME/tempbackup/Muttrc /etc/Muttrc
+                fi
+                if [ ! "$?" = "0" ]; then
+                    rm -rf $temp_restore_dir
+                    set_user_permissions
+                    backup_unmount_drive
+                    exit 276
+                fi
+                rm -rf $temp_restore_dir
+            fi
+        done
+    fi
 }
 
 function restore_gpg {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'gpg' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/gnupg ]; then
-		for d in $USB_MOUNT/backup/gnupg/*/ ; do
-			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring gnupg settings for $USERNAME"
-				temp_restore_dir=/root/tempgnupg
-				restore_directory_from_usb $temp_restore_dir gnupg/$USERNAME
-				cp -r $temp_restore_dir/home/$USERNAME/.gnupg /home/$USERNAME/
-				if [ ! "$?" = "0" ]; then
-					rm -rf $temp_restore_dir
-					set_user_permissions
-					backup_unmount_drive
-					exit 276
-				fi
-				rm -rf $temp_restore_dir
-				if [[ "$USERNAME" == "$ADMIN_USERNAME" ]]; then
-					cp -r /home/$USERNAME/.gnupg /root
-					if [ ! "$?" = "0" ]; then
-						set_user_permissions
-						backup_unmount_drive
-						exit 283
-					fi
-				fi
-			fi
-		done
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'gpg' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/gnupg ]; then
+        for d in $USB_MOUNT/backup/gnupg/*/ ; do
+            USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring gnupg settings for $USERNAME"
+                temp_restore_dir=/root/tempgnupg
+                restore_directory_from_usb $temp_restore_dir gnupg/$USERNAME
+                cp -r $temp_restore_dir/home/$USERNAME/.gnupg /home/$USERNAME/
+                if [ ! "$?" = "0" ]; then
+                    rm -rf $temp_restore_dir
+                    set_user_permissions
+                    backup_unmount_drive
+                    exit 276
+                fi
+                rm -rf $temp_restore_dir
+                if [[ "$USERNAME" == "$ADMIN_USERNAME" ]]; then
+                    cp -r /home/$USERNAME/.gnupg /root
+                    if [ ! "$?" = "0" ]; then
+                        set_user_permissions
+                        backup_unmount_drive
+                        exit 283
+                    fi
+                fi
+            fi
+        done
+    fi
 }
 
 function restore_procmail {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'procmail' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/procmail ]; then
-		for d in $USB_MOUNT/backup/procmail/*/ ; do
-			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring procmail settings for $USERNAME"
-				temp_restore_dir=/root/tempprocmail
-				restore_directory_from_usb $temp_restore_dir procmail/$USERNAME
-				cp -f $temp_restore_dir/home/$USERNAME/tempbackup/.procmailrc /home/$USERNAME/
-				if [ ! "$?" = "0" ]; then
-					rm -rf $temp_restore_dir
-					set_user_permissions
-					backup_unmount_drive
-					exit 276
-				fi
-				rm -rf $temp_restore_dir
-			fi
-		done
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'procmail' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/procmail ]; then
+        for d in $USB_MOUNT/backup/procmail/*/ ; do
+            USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring procmail settings for $USERNAME"
+                temp_restore_dir=/root/tempprocmail
+                restore_directory_from_usb $temp_restore_dir procmail/$USERNAME
+                cp -f $temp_restore_dir/home/$USERNAME/tempbackup/.procmailrc /home/$USERNAME/
+                if [ ! "$?" = "0" ]; then
+                    rm -rf $temp_restore_dir
+                    set_user_permissions
+                    backup_unmount_drive
+                    exit 276
+                fi
+                rm -rf $temp_restore_dir
+            fi
+        done
+    fi
 }
 
 function restore_spamassassin {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'spamassassin' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/spamassassin ]; then
-		for d in $USB_MOUNT/backup/spamassassin/*/ ; do
-			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-				if [ -d $USB_MOUNT/backup/spamassassin/$USERNAME ]; then
-					if [ ! -d /home/$USERNAME ]; then
-						${PROJECT_NAME}-adduser $USERNAME
-					fi
-					echo $"Restoring spamassassin settings for $USERNAME"
-					temp_restore_dir=/root/tempspamassassin
-					restore_directory_from_usb $temp_restore_dir spamassassin/$USERNAME
-					cp -rf $temp_restore_dir/home/$USERNAME/.spamassassin /home/$USERNAME/
-					if [ ! "$?" = "0" ]; then
-						rm -rf $temp_restore_dir
-						set_user_permissions
-						backup_unmount_drive
-						exit 276
-					fi
-					rm -rf $temp_restore_dir
-				fi
-			fi
-		done
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'spamassassin' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/spamassassin ]; then
+        for d in $USB_MOUNT/backup/spamassassin/*/ ; do
+            USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+                if [ -d $USB_MOUNT/backup/spamassassin/$USERNAME ]; then
+                    if [ ! -d /home/$USERNAME ]; then
+                        ${PROJECT_NAME}-adduser $USERNAME
+                    fi
+                    echo $"Restoring spamassassin settings for $USERNAME"
+                    temp_restore_dir=/root/tempspamassassin
+                    restore_directory_from_usb $temp_restore_dir spamassassin/$USERNAME
+                    cp -rf $temp_restore_dir/home/$USERNAME/.spamassassin /home/$USERNAME/
+                    if [ ! "$?" = "0" ]; then
+                        rm -rf $temp_restore_dir
+                        set_user_permissions
+                        backup_unmount_drive
+                        exit 276
+                    fi
+                    rm -rf $temp_restore_dir
+                fi
+            fi
+        done
+    fi
 }
 
 function restore_admin_readme {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'readme' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/readme ]; then
-		echo $"Restoring admin user README"
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'readme' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/readme ]; then
+        echo $"Restoring admin user README"
 
-		# Make a backup of the original README file
-		# incase old passwords need to be used
-		if [ -f /home/$ADMIN_USERNAME/README ]; then
-			if [ ! -f /home/$ADMIN_USERNAME/README_original ]; then
-				cp /home/$ADMIN_USERNAME/README /home/$ADMIN_USERNAME/README_original
-			fi
-		fi
+        # Make a backup of the original README file
+        # incase old passwords need to be used
+        if [ -f /home/$ADMIN_USERNAME/README ]; then
+            if [ ! -f /home/$ADMIN_USERNAME/README_original ]; then
+                cp /home/$ADMIN_USERNAME/README /home/$ADMIN_USERNAME/README_original
+            fi
+        fi
 
-		temp_restore_dir=/root/tempreadme
-		restore_directory_from_usb $temp_restore_dir readme
-		cp -f $temp_restore_dir/home/$ADMIN_USERNAME/tempbackup/README /home/$ADMIN_USERNAME/
-		if [ ! "$?" = "0" ]; then
-			rm -rf $temp_restore_dir
-			set_user_permissions
-			backup_unmount_drive
-			exit 276
-		fi
-		rm -rf $temp_restore_dir
-	fi
+        temp_restore_dir=/root/tempreadme
+        restore_directory_from_usb $temp_restore_dir readme
+        cp -f $temp_restore_dir/home/$ADMIN_USERNAME/tempbackup/README /home/$ADMIN_USERNAME/
+        if [ ! "$?" = "0" ]; then
+            rm -rf $temp_restore_dir
+            set_user_permissions
+            backup_unmount_drive
+            exit 276
+        fi
+        rm -rf $temp_restore_dir
+    fi
 }
 
 function restore_user_ssh_keys {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'ssh' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/ssh ]; then
-		for d in $USB_MOUNT/backup/ssh/*/ ; do
-			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring ssh keys for $USERNAME"
-				temp_restore_dir=/root/tempssh
-				restore_directory_from_usb $temp_restore_dir ssh/$USERNAME
-				cp -r $temp_restore_dir/home/$USERNAME/.ssh /home/$USERNAME/
-				if [ ! "$?" = "0" ]; then
-					rm -rf $temp_restore_dir
-					set_user_permissions
-					backup_unmount_drive
-					exit 664
-				fi
-				rm -rf $temp_restore_dir
-			fi
-		done
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'ssh' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/ssh ]; then
+        for d in $USB_MOUNT/backup/ssh/*/ ; do
+            USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring ssh keys for $USERNAME"
+                temp_restore_dir=/root/tempssh
+                restore_directory_from_usb $temp_restore_dir ssh/$USERNAME
+                cp -r $temp_restore_dir/home/$USERNAME/.ssh /home/$USERNAME/
+                if [ ! "$?" = "0" ]; then
+                    rm -rf $temp_restore_dir
+                    set_user_permissions
+                    backup_unmount_drive
+                    exit 664
+                fi
+                rm -rf $temp_restore_dir
+            fi
+        done
+    fi
 }
 
 function restore_user_config {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'userconfig' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/config ]; then
-		for d in $USB_MOUNT/backup/config/*/ ; do
-			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring config files for $USERNAME"
-				temp_restore_dir=/root/tempconfig
-				restore_directory_from_usb $temp_restore_dir config/$USERNAME
-				cp -r $temp_restore_dir/home/$USERNAME/.config /home/$USERNAME/
-				if [ ! "$?" = "0" ]; then
-					rm -rf $temp_restore_dir
-					set_user_permissions
-					backup_unmount_drive
-					exit 664
-				fi
-				rm -rf $temp_restore_dir
-			fi
-		done
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'userconfig' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/config ]; then
+        for d in $USB_MOUNT/backup/config/*/ ; do
+            USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring config files for $USERNAME"
+                temp_restore_dir=/root/tempconfig
+                restore_directory_from_usb $temp_restore_dir config/$USERNAME
+                cp -r $temp_restore_dir/home/$USERNAME/.config /home/$USERNAME/
+                if [ ! "$?" = "0" ]; then
+                    rm -rf $temp_restore_dir
+                    set_user_permissions
+                    backup_unmount_drive
+                    exit 664
+                fi
+                rm -rf $temp_restore_dir
+            fi
+        done
+    fi
 }
 
 function gpg_pubkey_from_email {
-	key_owner_username=$1
-	key_email_address=$2
-	key_id=
-	if [[ $key_owner_username != "root" ]]; then
-		key_id=$(su -c "gpg --list-keys $key_email_address | grep 'pub '" - $key_owner_username | awk -F ' ' '{print $2}' | awk -F '/' '{print $2}')
-	else
-		key_id=$(gpg --list-keys $key_email_address | grep 'pub ' | awk -F ' ' '{print $2}' | awk -F '/' '{print $2}')
-	fi
-	echo $key_id
+    key_owner_username=$1
+    key_email_address=$2
+    key_id=
+    if [[ $key_owner_username != "root" ]]; then
+        key_id=$(su -c "gpg --list-keys $key_email_address | grep 'pub '" - $key_owner_username | awk -F ' ' '{print $2}' | awk -F '/' '{print $2}')
+    else
+        key_id=$(gpg --list-keys $key_email_address | grep 'pub ' | awk -F ' ' '{print $2}' | awk -F '/' '{print $2}')
+    fi
+    echo $key_id
 }
 
 function restore_user_monkeysphere {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'usermonkeysphere' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/monkeysphere ]; then
-		for d in $USB_MOUNT/backup/monkeysphere/*/ ; do
-			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring monkeysphere ids for $USERNAME"
-				temp_restore_dir=/root/tempmonkeysphere
-				restore_directory_from_usb $temp_restore_dir monkeysphere/$USERNAME
-				cp -r $temp_restore_dir/home/$USERNAME/.monkeysphere /home/$USERNAME/
-				if [ ! "$?" = "0" ]; then
-					rm -rf $temp_restore_dir
-					set_user_permissions
-					backup_unmount_drive
-					exit 664
-				fi
-				rm -rf $temp_restore_dir
-			fi
-		done
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'usermonkeysphere' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/monkeysphere ]; then
+        for d in $USB_MOUNT/backup/monkeysphere/*/ ; do
+            USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring monkeysphere ids for $USERNAME"
+                temp_restore_dir=/root/tempmonkeysphere
+                restore_directory_from_usb $temp_restore_dir monkeysphere/$USERNAME
+                cp -r $temp_restore_dir/home/$USERNAME/.monkeysphere /home/$USERNAME/
+                if [ ! "$?" = "0" ]; then
+                    rm -rf $temp_restore_dir
+                    set_user_permissions
+                    backup_unmount_drive
+                    exit 664
+                fi
+                rm -rf $temp_restore_dir
+            fi
+        done
 
-		# The admin user is the identity certifier
-		MY_EMAIL_ADDRESS="${ADMIN_USERNAME}@${HOSTNAME}"
-		if grep -q "MY_EMAIL_ADDRESS" $CONFIG_FILE; then
-			MY_EMAIL_ADDRESS=$(grep "MY_EMAIL_ADDRESS" $CONFIG_FILE | awk -F '=' '{print $2}')
-		fi
-		MY_GPG_PUBLIC_KEY_ID=$(gpg_pubkey_from_email "$ADMIN_USERNAME" "$MY_EMAIL_ADDRESS")
-		fpr=$(gpg --with-colons --fingerprint $MY_GPG_PUBLIC_KEY_ID | grep fpr | head -n 1 | awk -F ':' '{print $10}')
-		monkeysphere-authentication add-identity-certifier $fpr
-		monkeysphere-authentication update-users
-	fi
+        # The admin user is the identity certifier
+        MY_EMAIL_ADDRESS="${ADMIN_USERNAME}@${HOSTNAME}"
+        if grep -q "MY_EMAIL_ADDRESS" $CONFIG_FILE; then
+            MY_EMAIL_ADDRESS=$(grep "MY_EMAIL_ADDRESS" $CONFIG_FILE | awk -F '=' '{print $2}')
+        fi
+        MY_GPG_PUBLIC_KEY_ID=$(gpg_pubkey_from_email "$ADMIN_USERNAME" "$MY_EMAIL_ADDRESS")
+        fpr=$(gpg --with-colons --fingerprint $MY_GPG_PUBLIC_KEY_ID | grep fpr | head -n 1 | awk -F ':' '{print $10}')
+        monkeysphere-authentication add-identity-certifier $fpr
+        monkeysphere-authentication update-users
+    fi
 }
 
 function restore_user_fin {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'userfin' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/fin ]; then
-		for d in $USB_MOUNT/backup/fin/*/ ; do
-			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring fin files for $USERNAME"
-				temp_restore_dir=/root/tempfin
-				restore_directory_from_usb $temp_restore_dir fin/$USERNAME
-				cp -r $temp_restore_dir/home/$USERNAME/.fin /home/$USERNAME/
-				if [ ! "$?" = "0" ]; then
-					rm -rf $temp_restore_dir
-					set_user_permissions
-					backup_unmount_drive
-					exit 664
-				fi
-				rm -rf $temp_restore_dir
-			fi
-		done
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'userfin' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/fin ]; then
+        for d in $USB_MOUNT/backup/fin/*/ ; do
+            USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring fin files for $USERNAME"
+                temp_restore_dir=/root/tempfin
+                restore_directory_from_usb $temp_restore_dir fin/$USERNAME
+                cp -r $temp_restore_dir/home/$USERNAME/.fin /home/$USERNAME/
+                if [ ! "$?" = "0" ]; then
+                    rm -rf $temp_restore_dir
+                    set_user_permissions
+                    backup_unmount_drive
+                    exit 664
+                fi
+                rm -rf $temp_restore_dir
+            fi
+        done
+    fi
 }
 
 function restore_user_local {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'userlocal' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/local ]; then
-		for d in $USB_MOUNT/backup/local/*/ ; do
-			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring local files for $USERNAME"
-				temp_restore_dir=/root/templocal
-				restore_directory_from_usb $temp_restore_dir local/$USERNAME
-				cp -r $temp_restore_dir/home/$USERNAME/.local /home/$USERNAME/
-				if [ ! "$?" = "0" ]; then
-					rm -rf $temp_restore_dir
-					set_user_permissions
-					backup_unmount_drive
-					exit 664
-				fi
-				rm -rf $temp_restore_dir
-			fi
-		done
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'userlocal' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/local ]; then
+        for d in $USB_MOUNT/backup/local/*/ ; do
+            USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring local files for $USERNAME"
+                temp_restore_dir=/root/templocal
+                restore_directory_from_usb $temp_restore_dir local/$USERNAME
+                cp -r $temp_restore_dir/home/$USERNAME/.local /home/$USERNAME/
+                if [ ! "$?" = "0" ]; then
+                    rm -rf $temp_restore_dir
+                    set_user_permissions
+                    backup_unmount_drive
+                    exit 664
+                fi
+                rm -rf $temp_restore_dir
+            fi
+        done
+    fi
 }
 
 function restore_certs {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'certs' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/ssl ]; then
-		echo $"Restoring certificates"
-		mkdir /root/tempssl
-		restore_directory_from_usb /root/tempssl ssl
-		cp -r /root/tempssl/etc/ssl/* /etc/ssl
-		if [ ! "$?" = "0" ]; then
-			set_user_permissions
-			backup_unmount_drive
-			exit 276
-		fi
-		rm -rf /root/tempssl
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'certs' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/ssl ]; then
+        echo $"Restoring certificates"
+        mkdir /root/tempssl
+        restore_directory_from_usb /root/tempssl ssl
+        cp -r /root/tempssl/etc/ssl/* /etc/ssl
+        if [ ! "$?" = "0" ]; then
+            set_user_permissions
+            backup_unmount_drive
+            exit 276
+        fi
+        rm -rf /root/tempssl
 
-		# restore ownership
-		if [ -f /etc/ssl/private/xmpp.key ]; then
-			chown prosody:prosody /etc/ssl/private/xmpp.key
-			chown prosody:prosody /etc/ssl/certs/xmpp.*
-		fi
-		if [ -d /etc/dovecot ]; then
-			chown root:dovecot /etc/ssl/private/dovecot.*
-			chown root:dovecot /etc/ssl/certs/dovecot.*
-		fi
-		if [ -f /etc/ssl/private/exim.key ]; then
-			cp /etc/ssl/private/exim.key /etc/exim4
-			cp /etc/ssl/certs/exim.crt /etc/exim4
-			cp /etc/ssl/certs/exim.dhparam /etc/exim4
-			chown root:Debian-exim /etc/exim4/exim.key /etc/exim4/exim.crt /etc/exim4/exim.dhparam
-			chmod 640 /etc/exim4/exim.key /etc/exim4/exim.crt /etc/exim4/exim.dhparam
-		fi
-		if [ -f /etc/ssl/private/mumble.key ]; then
-			if [ -d /var/lib/mumble-server ]; then
-				cp /etc/ssl/certs/mumble.* /var/lib/mumble-server
-				cp /etc/ssl/private/mumble.key /var/lib/mumble-server
-				chown -R mumble-server:mumble-server /var/lib/mumble-server
-			fi
-		fi
-	fi
+        # restore ownership
+        if [ -f /etc/ssl/private/xmpp.key ]; then
+            chown prosody:prosody /etc/ssl/private/xmpp.key
+            chown prosody:prosody /etc/ssl/certs/xmpp.*
+        fi
+        if [ -d /etc/dovecot ]; then
+            chown root:dovecot /etc/ssl/private/dovecot.*
+            chown root:dovecot /etc/ssl/certs/dovecot.*
+        fi
+        if [ -f /etc/ssl/private/exim.key ]; then
+            cp /etc/ssl/private/exim.key /etc/exim4
+            cp /etc/ssl/certs/exim.crt /etc/exim4
+            cp /etc/ssl/certs/exim.dhparam /etc/exim4
+            chown root:Debian-exim /etc/exim4/exim.key /etc/exim4/exim.crt /etc/exim4/exim.dhparam
+            chmod 640 /etc/exim4/exim.key /etc/exim4/exim.crt /etc/exim4/exim.dhparam
+        fi
+        if [ -f /etc/ssl/private/mumble.key ]; then
+            if [ -d /var/lib/mumble-server ]; then
+                cp /etc/ssl/certs/mumble.* /var/lib/mumble-server
+                cp /etc/ssl/private/mumble.key /var/lib/mumble-server
+                chown -R mumble-server:mumble-server /var/lib/mumble-server
+            fi
+        fi
+    fi
 }
 
 function restore_personal_settings {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'personal' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/personal ]; then
-		for d in $USB_MOUNT/backup/personal/*/ ; do
-			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-				if [ -d $USB_MOUNT/backup/personal/$USERNAME ]; then
-					if [ ! -d /home/$USERNAME ]; then
-						${PROJECT_NAME}-adduser $USERNAME
-					fi
-					echo $"Restoring personal settings for $USERNAME"
-					temp_restore_dir=/root/temppersonal
-					restore_directory_from_usb $temp_restore_dir personal/$USERNAME
-					if [ -d /home/$USERNAME/personal ]; then
-						rm -rf /home/$USERNAME/personal
-					fi
-					mv $temp_restore_dir/home/$USERNAME/personal /home/$USERNAME
-					if [ ! "$?" = "0" ]; then
-						set_user_permissions
-						backup_unmount_drive
-						exit 184
-					fi
-					rm -rf $temp_restore_dir
-				fi
-			fi
-		done
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'personal' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/personal ]; then
+        for d in $USB_MOUNT/backup/personal/*/ ; do
+            USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+                if [ -d $USB_MOUNT/backup/personal/$USERNAME ]; then
+                    if [ ! -d /home/$USERNAME ]; then
+                        ${PROJECT_NAME}-adduser $USERNAME
+                    fi
+                    echo $"Restoring personal settings for $USERNAME"
+                    temp_restore_dir=/root/temppersonal
+                    restore_directory_from_usb $temp_restore_dir personal/$USERNAME
+                    if [ -d /home/$USERNAME/personal ]; then
+                        rm -rf /home/$USERNAME/personal
+                    fi
+                    mv $temp_restore_dir/home/$USERNAME/personal /home/$USERNAME
+                    if [ ! "$?" = "0" ]; then
+                        set_user_permissions
+                        backup_unmount_drive
+                        exit 184
+                    fi
+                    rm -rf $temp_restore_dir
+                fi
+            fi
+        done
+    fi
 }
 
 function restore_mailing_list {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'mailinglist' ]]; then
-			return
-		fi
-	fi
-	if [ -d /var/spool/mlmmj ]; then
-		echo $"Restoring public mailing list"
-		temp_restore_dir=/root/tempmailinglist
-		restore_directory_from_usb $temp_restore_dir mailinglist
-		cp -r $temp_restore_dir/root/spool/mlmmj/* /var/spool/mlmmj
-		if [ ! "$?" = "0" ]; then
-			set_user_permissions
-			backup_unmount_drive
-			exit 526
-		fi
-		rm -rf $temp_restore_dir
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'mailinglist' ]]; then
+            return
+        fi
+    fi
+    if [ -d /var/spool/mlmmj ]; then
+        echo $"Restoring public mailing list"
+        temp_restore_dir=/root/tempmailinglist
+        restore_directory_from_usb $temp_restore_dir mailinglist
+        cp -r $temp_restore_dir/root/spool/mlmmj/* /var/spool/mlmmj
+        if [ ! "$?" = "0" ]; then
+            set_user_permissions
+            backup_unmount_drive
+            exit 526
+        fi
+        rm -rf $temp_restore_dir
+    fi
 }
 
 function restore_email {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'email' ]]; then
-			return
-		fi
-	fi
-	if [ -d $USB_MOUNT/backup/mail ]; then
-		for d in $USB_MOUNT/backup/mail/*/ ; do
-			USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-			if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring emails for $USERNAME"
-				temp_restore_dir=/root/tempmail
-				restore_directory_from_usb $temp_restore_dir mail/$USERNAME
-				if [ ! -d /home/$USERNAME/Maildir ]; then
-					mkdir /home/$USERNAME/Maildir
-				fi
-				tar -xzvf $temp_restore_dir/root/tempbackupemail/$USERNAME/maildir.tar.gz -C /
-				if [ ! "$?" = "0" ]; then
-					set_user_permissions
-					backup_unmount_drive
-					exit 927
-				fi
-				rm -rf $temp_restore_dir
-			fi
-		done
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'email' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/mail ]; then
+        for d in $USB_MOUNT/backup/mail/*/ ; do
+            USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring emails for $USERNAME"
+                temp_restore_dir=/root/tempmail
+                restore_directory_from_usb $temp_restore_dir mail/$USERNAME
+                if [ ! -d /home/$USERNAME/Maildir ]; then
+                    mkdir /home/$USERNAME/Maildir
+                fi
+                tar -xzvf $temp_restore_dir/root/tempbackupemail/$USERNAME/maildir.tar.gz -C /
+                if [ ! "$?" = "0" ]; then
+                    set_user_permissions
+                    backup_unmount_drive
+                    exit 927
+                fi
+                rm -rf $temp_restore_dir
+            fi
+        done
+    fi
 }
 
 function get_restore_app {
-	if [ ${1} ]; then
-		if [ ! -d /home/${1} ]; then
-			RESTORE_APP=${1}
-			echo $"Restore $RESTORE_APP"
-		fi
-	fi
+    if [ ${1} ]; then
+        if [ ! -d /home/${1} ]; then
+            RESTORE_APP=${1}
+            echo $"Restore $RESTORE_APP"
+        fi
+    fi
 }
 
 get_restore_app ${2}
@@ -722,6 +722,9 @@ restore_apps local
 set_user_permissions
 backup_unmount_drive
 
+# ensure that all TLS certificates are pinned
+${PROJECT_NAME}-pin-cert all
+
 echo $"Restore from USB drive is complete. You can now unplug it."
 
 exit 0
diff --git a/src/freedombone-restore-remote b/src/freedombone-restore-remote
index fcb4d5a2..1eac92de 100755
--- a/src/freedombone-restore-remote
+++ b/src/freedombone-restore-remote
@@ -42,7 +42,7 @@ SERVER_NAME=$1
 RESTORE_APP='all'
 
 if [ ${2} ]; then
-	RESTORE_APP=${2}
+    RESTORE_APP=${2}
 fi
 
 ADMIN_USERNAME=$(cat $COMPLETION_FILE | grep "Admin user" | -nawk -F ':' '{print $2}')
@@ -54,18 +54,18 @@ SERVER_DIRECTORY=/root/remoterestore
 BACKUP_LIST=/home/${ADMIN_USERNAME}/backup.list
 
 if [ ! $SERVER_NAME ]; then
-	echo $'restorefromfriend [server]'
-	exit 1
+    echo $'restorefromfriend [server]'
+    exit 1
 fi
 
 if [ ! -f $BACKUP_LIST ]; then
-	echo $"No friends list found at $BACKUP_LIST"
-	exit 2
+    echo $"No friends list found at $BACKUP_LIST"
+    exit 2
 fi
 
 if ! grep -q "$SERVER_NAME" $BACKUP_LIST; then
-	echo $"Server not found within the friends list"
-	exit 3
+    echo $"Server not found within the friends list"
+    exit 3
 fi
 
 REMOTE_SERVER=$(grep -i "$SERVER_NAME" $BACKUP_LIST | awk -F ' ' '{print $1}')
@@ -79,12 +79,12 @@ NOW=$(date +"%Y-%m-%d %H:%M:%S")
 echo "$NOW Starting restore from $REMOTE_SERVER" >> /var/log/remotebackups.log
 rsync -ratlzv --rsh="/usr/bin/sshpass -p $REMOTE_PASSWORD ssh -p $REMOTE_SSH_PORT -o StrictHostKeyChecking=no" $REMOTE_SERVER/backup $SERVER_DIRECTORY
 if [ ! "$?" = "0" ]; then
-	echo "$NOW Restore from $REMOTE_SERVER failed" >> /var/log/remotebackups.log
-	# Send a warning email
-	echo "Restore from $REMOTE_SERVER failed" | mail -s "${PROJECT_NAME} restore from friend" $ADMIN_EMAIL_ADDRESS
-	exit 790
+    echo "$NOW Restore from $REMOTE_SERVER failed" >> /var/log/remotebackups.log
+    # Send a warning email
+    echo "Restore from $REMOTE_SERVER failed" | mail -s "${PROJECT_NAME} restore from friend" $ADMIN_EMAIL_ADDRESS
+    exit 790
 else
-	echo "$NOW Restored encrypted data from $REMOTE_SERVER" >> /var/log/remotebackups.log
+    echo "$NOW Restored encrypted data from $REMOTE_SERVER" >> /var/log/remotebackups.log
 fi
 
 # get the version of Go being used
@@ -94,539 +94,539 @@ GO_VERSION=$(cat /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-go | gre
 DATABASE_PASSWORD=$(cat /root/dbpass)
 
 function restore_directory_from_friend {
-	if [ ! -d ${1} ]; then
-		mkdir ${1}
-	fi
-	obnam restore -r $SERVER_DIRECTORY/backup/${2} --to ${1}
+    if [ ! -d ${1} ]; then
+        mkdir ${1}
+    fi
+    obnam restore -r $SERVER_DIRECTORY/backup/${2} --to ${1}
 }
 
 function copy_gpg_keys {
-	echo $"Copying GPG keys from admin user to root"
-	cp -r /home/$ADMIN_USERNAME/.gnupg /root
+    echo $"Copying GPG keys from admin user to root"
+    cp -r /home/$ADMIN_USERNAME/.gnupg /root
 }
 
 function restore_configuration {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'configuration' ]]; then
-			return
-		fi
-	fi
-	if [ -d $SERVER_DIRECTORY/backup/config ]; then
-		echo $"Restoring configuration files"
-		temp_restore_dir=/root/tempconfig
-		restore_directory_from_friend $temp_restore_dir config
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'configuration' ]]; then
+            return
+        fi
+    fi
+    if [ -d $SERVER_DIRECTORY/backup/config ]; then
+        echo $"Restoring configuration files"
+        temp_restore_dir=/root/tempconfig
+        restore_directory_from_friend $temp_restore_dir config
 
-		cp -f $temp_restore_dir/root/${PROJECT_NAME}.cfg $CONFIG_FILE
-		if [ ! "$?" = "0" ]; then
-			unmount_drive
-			rm -rf $temp_restore_dir
-			exit 5372
-		fi
-		if [ -f $CONFIG_FILE ]; then
-			# install according to the config file
-			freedombone -c $CONFIG_FILE
-		fi
+        cp -f $temp_restore_dir/root/${PROJECT_NAME}.cfg $CONFIG_FILE
+        if [ ! "$?" = "0" ]; then
+            unmount_drive
+            rm -rf $temp_restore_dir
+            exit 5372
+        fi
+        if [ -f $CONFIG_FILE ]; then
+            # install according to the config file
+            freedombone -c $CONFIG_FILE
+        fi
 
-		cp -f $temp_restore_dir/root/${PROJECT_NAME}-completed.txt $COMPLETION_FILE
-		if [ ! "$?" = "0" ]; then
-			unmount_drive
-			rm -rf $temp_restore_dir
-			exit 7252
-		fi
+        cp -f $temp_restore_dir/root/${PROJECT_NAME}-completed.txt $COMPLETION_FILE
+        if [ ! "$?" = "0" ]; then
+            unmount_drive
+            rm -rf $temp_restore_dir
+            exit 7252
+        fi
 
-		if [ -f ${temp_restore_dir}${BACKUP_EXTRA_DIRECTORIES} ]; then
-			cp -f ${temp_restore_dir}${BACKUP_EXTRA_DIRECTORIES} ${BACKUP_EXTRA_DIRECTORIES}
-			if [ ! "$?" = "0" ]; then
-				unmount_drive
-				rm -rf $temp_restore_dir
-				exit 62121
-			fi
-		fi
+        if [ -f ${temp_restore_dir}${BACKUP_EXTRA_DIRECTORIES} ]; then
+            cp -f ${temp_restore_dir}${BACKUP_EXTRA_DIRECTORIES} ${BACKUP_EXTRA_DIRECTORIES}
+            if [ ! "$?" = "0" ]; then
+                unmount_drive
+                rm -rf $temp_restore_dir
+                exit 62121
+            fi
+        fi
 
-		# restore nginx password hashes
-		if [ -f $temp_restore_dir/root/htpasswd ]; then
-			cp -f $temp_restore_dir/root/htpasswd /etc/nginx/.htpasswd
-		fi
+        # restore nginx password hashes
+        if [ -f $temp_restore_dir/root/htpasswd ]; then
+            cp -f $temp_restore_dir/root/htpasswd /etc/nginx/.htpasswd
+        fi
 
-		rm -rf $temp_restore_dir
-	fi
+        rm -rf $temp_restore_dir
+    fi
 }
 
 function restore_mariadb {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'mariadb' ]]; then
-			return
-		fi
-	fi
-	if [ -d $SERVER_DIRECTORY/backup/mariadb ]; then
-		echo $"Restoring MariaDB settings"
-		temp_restore_dir=/root/tempmariadb
-		restore_directory_from_friend $temp_restore_dir mariadb
-		echo $"Get the MariaDB password from the backup"
-		if [ ! -f ${temp_restore_dir}${temp_restore_dir}/db ]; then
-			echo $"MariaDB password file not found"
-			exit 495
-		fi
-		BACKUP_MARIADB_PASSWORD=$(cat ${temp_restore_dir}${temp_restore_dir}/db)
-		if [[ "$BACKUP_MARIADB_PASSWORD" != "$DATABASE_PASSWORD" ]]; then
-			echo $"Restore the MariaDB user table"
-			mysqlsuccess=$(mysql -u root --password="$DATABASE_PASSWORD" mysql -o < ${temp_restore_dir}${temp_restore_dir}/mysql.sql)
-			if [ ! "$?" = "0" ]; then
-				echo $"Try again using the password obtained from backup"
-				mysqlsuccess=$(mysql -u root --password="$BACKUP_MARIADB_PASSWORD" mysql -o < ${temp_restore_dir}${temp_restore_dir}/mysql.sql)
-			fi
-			if [ ! "$?" = "0" ]; then
-				echo "$mysqlsuccess"
-				exit 962
-			fi
-			echo $"Restarting database"
-			service mysql restart
-			echo $"Change the MariaDB password to the backup version"
-			DATABASE_PASSWORD=$BACKUP_MARIADB_PASSWORD
-		fi
-		shred -zu ${temp_restore_dir}${temp_restore_dir}/db
-		rm -rf ${temp_restore_dir}
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'mariadb' ]]; then
+            return
+        fi
+    fi
+    if [ -d $SERVER_DIRECTORY/backup/mariadb ]; then
+        echo $"Restoring MariaDB settings"
+        temp_restore_dir=/root/tempmariadb
+        restore_directory_from_friend $temp_restore_dir mariadb
+        echo $"Get the MariaDB password from the backup"
+        if [ ! -f ${temp_restore_dir}${temp_restore_dir}/db ]; then
+            echo $"MariaDB password file not found"
+            exit 495
+        fi
+        BACKUP_MARIADB_PASSWORD=$(cat ${temp_restore_dir}${temp_restore_dir}/db)
+        if [[ "$BACKUP_MARIADB_PASSWORD" != "$DATABASE_PASSWORD" ]]; then
+            echo $"Restore the MariaDB user table"
+            mysqlsuccess=$(mysql -u root --password="$DATABASE_PASSWORD" mysql -o < ${temp_restore_dir}${temp_restore_dir}/mysql.sql)
+            if [ ! "$?" = "0" ]; then
+                echo $"Try again using the password obtained from backup"
+                mysqlsuccess=$(mysql -u root --password="$BACKUP_MARIADB_PASSWORD" mysql -o < ${temp_restore_dir}${temp_restore_dir}/mysql.sql)
+            fi
+            if [ ! "$?" = "0" ]; then
+                echo "$mysqlsuccess"
+                exit 962
+            fi
+            echo $"Restarting database"
+            service mysql restart
+            echo $"Change the MariaDB password to the backup version"
+            DATABASE_PASSWORD=$BACKUP_MARIADB_PASSWORD
+        fi
+        shred -zu ${temp_restore_dir}${temp_restore_dir}/db
+        rm -rf ${temp_restore_dir}
 
-		# Change database password file
-		echo "$DATABASE_PASSWORD" > /root/dbpass
-		chmod 600 /root/dbpass
-	fi
+        # Change database password file
+        echo "$DATABASE_PASSWORD" > /root/dbpass
+        chmod 600 /root/dbpass
+    fi
 }
 
 function restore_letsencrypt {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'letsencrypt' ]]; then
-			return
-		fi
-	fi
-	if [ -d $SERVER_DIRECTORY/backup/letsencrypt ]; then
-		echo $"Restoring Lets Encrypt settings"
-		restore_directory_from_friend / letsencrypt
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'letsencrypt' ]]; then
+            return
+        fi
+    fi
+    if [ -d $SERVER_DIRECTORY/backup/letsencrypt ]; then
+        echo $"Restoring Lets Encrypt settings"
+        restore_directory_from_friend / letsencrypt
+    fi
 }
 
 function restore_tor {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'tor' ]]; then
-			return
-		fi
-	fi
-	if [ -d $SERVER_DIRECTORY/backup/tor ]; then
-		echo $"Restoring Tor settings"
-		restore_directory_from_friend / tor
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'tor' ]]; then
+            return
+        fi
+    fi
+    if [ -d $SERVER_DIRECTORY/backup/tor ]; then
+        echo $"Restoring Tor settings"
+        restore_directory_from_friend / tor
+    fi
 }
 
 function restore_mutt_settings {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'mutt' ]]; then
-			return
-		fi
-	fi
-	for d in $SERVER_DIRECTORY/backup/mutt/*/ ; do
-		USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-		if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-			if [ -d $SERVER_DIRECTORY/backup/mutt/$USERNAME ]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring Mutt settings for $USERNAME"
-				temp_restore_dir=/root/tempmutt
-				restore_directory_from_friend ${temp_restore_dir} mutt/$USERNAME
-				if [ -f ${temp_restore_dir}/home/$USERNAME/tempbackup/.muttrc ]; then
-					cp -f ${temp_restore_dir}/home/$USERNAME/tempbackup/.muttrc /home/$USERNAME/.muttrc
-				fi
-				if [ -f ${temp_restore_dir}/home/$USERNAME/tempbackup/Muttrc ]; then
-					cp -f ${temp_restore_dir}/home/$USERNAME/tempbackup/Muttrc /etc/Muttrc
-				fi
-				if [ ! "$?" = "0" ]; then
-					rm -rf ${temp_restore_dir}
-					exit 276
-				fi
-				rm -rf ${temp_restore_dir}
-			fi
-		fi
-	done
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'mutt' ]]; then
+            return
+        fi
+    fi
+    for d in $SERVER_DIRECTORY/backup/mutt/*/ ; do
+        USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+            if [ -d $SERVER_DIRECTORY/backup/mutt/$USERNAME ]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring Mutt settings for $USERNAME"
+                temp_restore_dir=/root/tempmutt
+                restore_directory_from_friend ${temp_restore_dir} mutt/$USERNAME
+                if [ -f ${temp_restore_dir}/home/$USERNAME/tempbackup/.muttrc ]; then
+                    cp -f ${temp_restore_dir}/home/$USERNAME/tempbackup/.muttrc /home/$USERNAME/.muttrc
+                fi
+                if [ -f ${temp_restore_dir}/home/$USERNAME/tempbackup/Muttrc ]; then
+                    cp -f ${temp_restore_dir}/home/$USERNAME/tempbackup/Muttrc /etc/Muttrc
+                fi
+                if [ ! "$?" = "0" ]; then
+                    rm -rf ${temp_restore_dir}
+                    exit 276
+                fi
+                rm -rf ${temp_restore_dir}
+            fi
+        fi
+    done
 }
 
 function restore_gpg {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'gpg' ]]; then
-			return
-		fi
-	fi
-	for d in $SERVER_DIRECTORY/backup/gnupg/*/ ; do
-		USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-		if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-			if [ -d $SERVER_DIRECTORY/backup/gnupg/$USERNAME ]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring gnupg settings for $USERNAME"
-				temp_restore_dir=/root/tempgnupg
-				restore_directory_from_friend ${temp_restore_dir} gnupg/$USERNAME
-				cp -r ${temp_restore_dir}/home/$USERNAME/.gnupg /home/$USERNAME/
-				if [ ! "$?" = "0" ]; then
-					rm -rf ${temp_restore_dir}
-					exit 276
-				fi
-				rm -rf ${temp_restore_dir}
-				if [[ "$USERNAME" == "$ADMIN_USERNAME" ]]; then
-					cp -r /home/$USERNAME/.gnupg /root
-					if [ ! "$?" = "0" ]; then
-						exit 283
-					fi
-				fi
-			fi
-		fi
-	done
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'gpg' ]]; then
+            return
+        fi
+    fi
+    for d in $SERVER_DIRECTORY/backup/gnupg/*/ ; do
+        USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+            if [ -d $SERVER_DIRECTORY/backup/gnupg/$USERNAME ]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring gnupg settings for $USERNAME"
+                temp_restore_dir=/root/tempgnupg
+                restore_directory_from_friend ${temp_restore_dir} gnupg/$USERNAME
+                cp -r ${temp_restore_dir}/home/$USERNAME/.gnupg /home/$USERNAME/
+                if [ ! "$?" = "0" ]; then
+                    rm -rf ${temp_restore_dir}
+                    exit 276
+                fi
+                rm -rf ${temp_restore_dir}
+                if [[ "$USERNAME" == "$ADMIN_USERNAME" ]]; then
+                    cp -r /home/$USERNAME/.gnupg /root
+                    if [ ! "$?" = "0" ]; then
+                        exit 283
+                    fi
+                fi
+            fi
+        fi
+    done
 }
 
 function restore_procmail {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'procmail' ]]; then
-			return
-		fi
-	fi
-	for d in $SERVER_DIRECTORY/backup/procmail/*/ ; do
-		USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-		if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-			if [ -d $SERVER_DIRECTORY/backup/procmail/$USERNAME ]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring procmail settings for $USERNAME"
-				temp_restore_dir=/root/tempprocmail
-				restore_directory_from_friend ${temp_restore_dir} procmail/$USERNAME
-				cp -f ${temp_restore_dir}/home/$USERNAME/tempbackup/.procmailrc /home/$USERNAME/
-				if [ ! "$?" = "0" ]; then
-					rm -rf ${temp_restore_dir}
-					exit 276
-				fi
-				rm -rf ${temp_restore_dir}
-			fi
-		fi
-	done
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'procmail' ]]; then
+            return
+        fi
+    fi
+    for d in $SERVER_DIRECTORY/backup/procmail/*/ ; do
+        USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+            if [ -d $SERVER_DIRECTORY/backup/procmail/$USERNAME ]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring procmail settings for $USERNAME"
+                temp_restore_dir=/root/tempprocmail
+                restore_directory_from_friend ${temp_restore_dir} procmail/$USERNAME
+                cp -f ${temp_restore_dir}/home/$USERNAME/tempbackup/.procmailrc /home/$USERNAME/
+                if [ ! "$?" = "0" ]; then
+                    rm -rf ${temp_restore_dir}
+                    exit 276
+                fi
+                rm -rf ${temp_restore_dir}
+            fi
+        fi
+    done
 }
 
 function restore_spamassassin {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'spamassassin' ]]; then
-			return
-		fi
-	fi
-	for d in $SERVER_DIRECTORY/backup/spamassassin/*/ ; do
-		USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-		if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-			if [ -d $SERVER_DIRECTORY/backup/spamassassin/$USERNAME ]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring spamassassin settings for $USERNAME"
-				temp_restore_dir=/root/tempspamassassin
-				restore_directory_from_friend $temp_restore_dir spamassassin/$USERNAME
-				cp -rf $temp_restore_dir/home/$USERNAME/.spamassassin /home/$USERNAME/
-				if [ ! "$?" = "0" ]; then
-					rm -rf $temp_restore_dir
-					exit 276
-				fi
-				rm -rf $temp_restore_dir
-			fi
-		fi
-	done
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'spamassassin' ]]; then
+            return
+        fi
+    fi
+    for d in $SERVER_DIRECTORY/backup/spamassassin/*/ ; do
+        USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+            if [ -d $SERVER_DIRECTORY/backup/spamassassin/$USERNAME ]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring spamassassin settings for $USERNAME"
+                temp_restore_dir=/root/tempspamassassin
+                restore_directory_from_friend $temp_restore_dir spamassassin/$USERNAME
+                cp -rf $temp_restore_dir/home/$USERNAME/.spamassassin /home/$USERNAME/
+                if [ ! "$?" = "0" ]; then
+                    rm -rf $temp_restore_dir
+                    exit 276
+                fi
+                rm -rf $temp_restore_dir
+            fi
+        fi
+    done
 }
 
 function restore_admin_readme {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'readme' ]]; then
-			return
-		fi
-	fi
-	if [ -d $SERVER_DIRECTORY/backup/readme ]; then
-		echo $"Restoring README"
-		temp_restore_dir=/root/tempreadme
-		restore_directory_from_friend $temp_restore_dir readme
-		cp -f $temp_restore_dir/home/$ADMIN_USERNAME/tempbackup/README /home/$ADMIN_USERNAME/
-		if [ ! "$?" = "0" ]; then
-			rm -rf $temp_restore_dir
-			exit 276
-		fi
-		rm -rf $temp_restore_dir
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'readme' ]]; then
+            return
+        fi
+    fi
+    if [ -d $SERVER_DIRECTORY/backup/readme ]; then
+        echo $"Restoring README"
+        temp_restore_dir=/root/tempreadme
+        restore_directory_from_friend $temp_restore_dir readme
+        cp -f $temp_restore_dir/home/$ADMIN_USERNAME/tempbackup/README /home/$ADMIN_USERNAME/
+        if [ ! "$?" = "0" ]; then
+            rm -rf $temp_restore_dir
+            exit 276
+        fi
+        rm -rf $temp_restore_dir
+    fi
 }
 
 function restore_ssh_keys {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'ssh' ]]; then
-			return
-		fi
-	fi
-	for d in $SERVER_DIRECTORY/backup/ssh/*/ ; do
-		USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-		if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-			if [ -d $SERVER_DIRECTORY/backup/ssh/$USERNAME ]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring ssh keys for $USERNAME"
-				temp_restore_dir=/root/tempssh
-				restore_directory_from_friend $temp_restore_dir ssh/$USERNAME
-				cp -r $temp_restore_dir/home/$USERNAME/.ssh /home/$USERNAME/
-				if [ ! "$?" = "0" ]; then
-					rm -rf $temp_restore_dir
-					exit 664
-				fi
-				rm -rf $temp_restore_dir
-			fi
-		fi
-	done
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'ssh' ]]; then
+            return
+        fi
+    fi
+    for d in $SERVER_DIRECTORY/backup/ssh/*/ ; do
+        USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+            if [ -d $SERVER_DIRECTORY/backup/ssh/$USERNAME ]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring ssh keys for $USERNAME"
+                temp_restore_dir=/root/tempssh
+                restore_directory_from_friend $temp_restore_dir ssh/$USERNAME
+                cp -r $temp_restore_dir/home/$USERNAME/.ssh /home/$USERNAME/
+                if [ ! "$?" = "0" ]; then
+                    rm -rf $temp_restore_dir
+                    exit 664
+                fi
+                rm -rf $temp_restore_dir
+            fi
+        fi
+    done
 }
 
 function restore_user_config {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'userconfig' ]]; then
-			return
-		fi
-	fi
-	for d in $SERVER_DIRECTORY/backup/config/*/ ; do
-		USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-		if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-			if [ -d $SERVER_DIRECTORY/backup/config/$USERNAME ]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring config files for $USERNAME"
-				temp_restore_dir=/root/tempconfig
-				restore_directory_from_friend $temp_restore_dir config/$USERNAME
-				cp -r $temp_restore_dir/home/$USERNAME/.config /home/$USERNAME/
-				if [ ! "$?" = "0" ]; then
-					rm -rf $temp_restore_dir
-					exit 664
-				fi
-				rm -rf $temp_restore_dir
-			fi
-		fi
-	done
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'userconfig' ]]; then
+            return
+        fi
+    fi
+    for d in $SERVER_DIRECTORY/backup/config/*/ ; do
+        USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+            if [ -d $SERVER_DIRECTORY/backup/config/$USERNAME ]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring config files for $USERNAME"
+                temp_restore_dir=/root/tempconfig
+                restore_directory_from_friend $temp_restore_dir config/$USERNAME
+                cp -r $temp_restore_dir/home/$USERNAME/.config /home/$USERNAME/
+                if [ ! "$?" = "0" ]; then
+                    rm -rf $temp_restore_dir
+                    exit 664
+                fi
+                rm -rf $temp_restore_dir
+            fi
+        fi
+    done
 }
 
 function gpg_pubkey_from_email {
-	key_owner_username=$1
-	key_email_address=$2
-	key_id=
-	if [[ $key_owner_username != "root" ]]; then
-		key_id=$(su -c "gpg --list-keys $key_email_address | grep 'pub '" - $key_owner_username | awk -F ' ' '{print $2}' | awk -F '/' '{print $2}')
-	else
-		key_id=$(gpg --list-keys $key_email_address | grep 'pub ' | awk -F ' ' '{print $2}' | awk -F '/' '{print $2}')
-	fi
-	echo $key_id
+    key_owner_username=$1
+    key_email_address=$2
+    key_id=
+    if [[ $key_owner_username != "root" ]]; then
+        key_id=$(su -c "gpg --list-keys $key_email_address | grep 'pub '" - $key_owner_username | awk -F ' ' '{print $2}' | awk -F '/' '{print $2}')
+    else
+        key_id=$(gpg --list-keys $key_email_address | grep 'pub ' | awk -F ' ' '{print $2}' | awk -F '/' '{print $2}')
+    fi
+    echo $key_id
 }
 
 function restore_user_monkeysphere {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'usermonkeysphere' ]]; then
-			return
-		fi
-	fi
-	for d in $SERVER_DIRECTORY/backup/monkeysphere/*/ ; do
-		USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-		if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-			if [ -d $SERVER_DIRECTORY/backup/monkeysphere/$USERNAME ]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring monkeysphere ids for $USERNAME"
-				temp_restore_dir=/root/tempmonkeysphere
-				restore_directory_from_friend $temp_restore_dir monkeysphere/$USERNAME
-				cp -r $temp_restore_dir/home/$USERNAME/.monkeysphere /home/$USERNAME/
-				if [ ! "$?" = "0" ]; then
-					rm -rf $temp_restore_dir
-					exit 664
-				fi
-				rm -rf $temp_restore_dir
-			fi
-		fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'usermonkeysphere' ]]; then
+            return
+        fi
+    fi
+    for d in $SERVER_DIRECTORY/backup/monkeysphere/*/ ; do
+        USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+            if [ -d $SERVER_DIRECTORY/backup/monkeysphere/$USERNAME ]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring monkeysphere ids for $USERNAME"
+                temp_restore_dir=/root/tempmonkeysphere
+                restore_directory_from_friend $temp_restore_dir monkeysphere/$USERNAME
+                cp -r $temp_restore_dir/home/$USERNAME/.monkeysphere /home/$USERNAME/
+                if [ ! "$?" = "0" ]; then
+                    rm -rf $temp_restore_dir
+                    exit 664
+                fi
+                rm -rf $temp_restore_dir
+            fi
+        fi
 
-		# The admin user is the identity certifier
-		MY_EMAIL_ADDRESS="${ADMIN_USERNAME}@${HOSTNAME}"
-		if grep -q "MY_EMAIL_ADDRESS" $CONFIG_FILE; then
-			MY_EMAIL_ADDRESS=$(grep "MY_EMAIL_ADDRESS" $CONFIG_FILE | awk -F '=' '{print $2}')
-		fi
-		MY_GPG_PUBLIC_KEY_ID=$(gpg_pubkey_from_email "$ADMIN_USERNAME" "$MY_EMAIL_ADDRESS")
-		fpr=$(gpg --with-colons --fingerprint $MY_GPG_PUBLIC_KEY_ID | grep fpr | head -n 1 | awk -F ':' '{print $10}')
-		monkeysphere-authentication add-identity-certifier $fpr
-		monkeysphere-authentication update-users
-	done
+        # The admin user is the identity certifier
+        MY_EMAIL_ADDRESS="${ADMIN_USERNAME}@${HOSTNAME}"
+        if grep -q "MY_EMAIL_ADDRESS" $CONFIG_FILE; then
+            MY_EMAIL_ADDRESS=$(grep "MY_EMAIL_ADDRESS" $CONFIG_FILE | awk -F '=' '{print $2}')
+        fi
+        MY_GPG_PUBLIC_KEY_ID=$(gpg_pubkey_from_email "$ADMIN_USERNAME" "$MY_EMAIL_ADDRESS")
+        fpr=$(gpg --with-colons --fingerprint $MY_GPG_PUBLIC_KEY_ID | grep fpr | head -n 1 | awk -F ':' '{print $10}')
+        monkeysphere-authentication add-identity-certifier $fpr
+        monkeysphere-authentication update-users
+    done
 }
 
 function restore_user_fin {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'userfin' ]]; then
-			return
-		fi
-	fi
-	for d in $SERVER_DIRECTORY/backup/fin/*/ ; do
-		USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-		if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-			if [ -d $SERVER_DIRECTORY/backup/fin/$USERNAME ]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring fin files for $USERNAME"
-				temp_restore_dir=/root/tempfin
-				restore_directory_from_friend $temp_restore_dir fin/$USERNAME
-				cp -r $temp_restore_dir/home/$USERNAME/.fin /home/$USERNAME/
-				if [ ! "$?" = "0" ]; then
-					rm -rf $temp_restore_dir
-					exit 664
-				fi
-				rm -rf $temp_restore_dir
-			fi
-		fi
-	done
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'userfin' ]]; then
+            return
+        fi
+    fi
+    for d in $SERVER_DIRECTORY/backup/fin/*/ ; do
+        USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+            if [ -d $SERVER_DIRECTORY/backup/fin/$USERNAME ]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring fin files for $USERNAME"
+                temp_restore_dir=/root/tempfin
+                restore_directory_from_friend $temp_restore_dir fin/$USERNAME
+                cp -r $temp_restore_dir/home/$USERNAME/.fin /home/$USERNAME/
+                if [ ! "$?" = "0" ]; then
+                    rm -rf $temp_restore_dir
+                    exit 664
+                fi
+                rm -rf $temp_restore_dir
+            fi
+        fi
+    done
 }
 
 function restore_user_local {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'userlocal' ]]; then
-			return
-		fi
-	fi
-	for d in $SERVER_DIRECTORY/backup/local/*/ ; do
-		USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-		if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-			if [ -d $SERVER_DIRECTORY/backup/local/$USERNAME ]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring local files for $USERNAME"
-				temp_restore_dir=/root/templocal
-				restore_directory_from_friend $temp_restore_dir local/$USERNAME
-				cp -r $temp_restore_dir/home/$USERNAME/.local /home/$USERNAME/
-				if [ ! "$?" = "0" ]; then
-					rm -rf $temp_restore_dir
-					exit 664
-				fi
-				rm -rf $temp_restore_dir
-			fi
-		fi
-	done
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'userlocal' ]]; then
+            return
+        fi
+    fi
+    for d in $SERVER_DIRECTORY/backup/local/*/ ; do
+        USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+            if [ -d $SERVER_DIRECTORY/backup/local/$USERNAME ]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring local files for $USERNAME"
+                temp_restore_dir=/root/templocal
+                restore_directory_from_friend $temp_restore_dir local/$USERNAME
+                cp -r $temp_restore_dir/home/$USERNAME/.local /home/$USERNAME/
+                if [ ! "$?" = "0" ]; then
+                    rm -rf $temp_restore_dir
+                    exit 664
+                fi
+                rm -rf $temp_restore_dir
+            fi
+        fi
+    done
 }
 
 function restore_certs {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'certs' ]]; then
-			return
-		fi
-	fi
-	if [ -d $SERVER_DIRECTORY/backup/ssl ]; then
-		echo $"Restoring certificates"
-		restore_directory_from_friend /root/tempssl ssl
-		cp -r /root/tempssl/etc/ssl/* /etc/ssl
-		if [ ! "$?" = "0" ]; then
-			exit 276
-		fi
-		rm -rf /root/tempssl
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'certs' ]]; then
+            return
+        fi
+    fi
+    if [ -d $SERVER_DIRECTORY/backup/ssl ]; then
+        echo $"Restoring certificates"
+        restore_directory_from_friend /root/tempssl ssl
+        cp -r /root/tempssl/etc/ssl/* /etc/ssl
+        if [ ! "$?" = "0" ]; then
+            exit 276
+        fi
+        rm -rf /root/tempssl
 
-		# restore ownership
-		if [ -f /etc/ssl/private/xmpp.key ]; then
-			chown prosody:prosody /etc/ssl/private/xmpp.key
-			chown prosody:prosody /etc/ssl/certs/xmpp.*
-		fi
-		if [ -d /etc/dovecot ]; then
-			chown root:dovecot /etc/ssl/private/dovecot.*
-			chown root:dovecot /etc/ssl/certs/dovecot.*
-		fi
-		if [ -f /etc/ssl/private/exim.key ]; then
-			cp /etc/ssl/private/exim.key /etc/exim4
-			cp /etc/ssl/certs/exim.crt /etc/exim4
-			cp /etc/ssl/certs/exim.dhparam /etc/exim4
-			chown root:Debian-exim /etc/exim4/exim.key /etc/exim4/exim.crt /etc/exim4/exim.dhparam
-			chmod 640 /etc/exim4/exim.key /etc/exim4/exim.crt /etc/exim4/exim.dhparam
-		fi
-		if [ -f /etc/ssl/private/mumble.key ]; then
-			if [ -d /var/lib/mumble-server ]; then
-				cp /etc/ssl/certs/mumble.* /var/lib/mumble-server
-				cp /etc/ssl/private/mumble.key /var/lib/mumble-server
-				chown -R mumble-server:mumble-server /var/lib/mumble-server
-			fi
-		fi
-	fi
+        # restore ownership
+        if [ -f /etc/ssl/private/xmpp.key ]; then
+            chown prosody:prosody /etc/ssl/private/xmpp.key
+            chown prosody:prosody /etc/ssl/certs/xmpp.*
+        fi
+        if [ -d /etc/dovecot ]; then
+            chown root:dovecot /etc/ssl/private/dovecot.*
+            chown root:dovecot /etc/ssl/certs/dovecot.*
+        fi
+        if [ -f /etc/ssl/private/exim.key ]; then
+            cp /etc/ssl/private/exim.key /etc/exim4
+            cp /etc/ssl/certs/exim.crt /etc/exim4
+            cp /etc/ssl/certs/exim.dhparam /etc/exim4
+            chown root:Debian-exim /etc/exim4/exim.key /etc/exim4/exim.crt /etc/exim4/exim.dhparam
+            chmod 640 /etc/exim4/exim.key /etc/exim4/exim.crt /etc/exim4/exim.dhparam
+        fi
+        if [ -f /etc/ssl/private/mumble.key ]; then
+            if [ -d /var/lib/mumble-server ]; then
+                cp /etc/ssl/certs/mumble.* /var/lib/mumble-server
+                cp /etc/ssl/private/mumble.key /var/lib/mumble-server
+                chown -R mumble-server:mumble-server /var/lib/mumble-server
+            fi
+        fi
+    fi
 }
 
 function restore_personal_settings {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'personal' ]]; then
-			return
-		fi
-	fi
-	for d in $SERVER_DIRECTORY/backup/personal/*/ ; do
-		USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-		if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-			if [ -d $SERVER_DIRECTORY/backup/personal/$USERNAME ]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring personal settings for $USERNAME"
-				temp_restore_dir=/root/temppersonal
-				restore_directory_from_friend $temp_restore_dir personal/$USERNAME
-				if [ -d /home/$USERNAME/personal ]; then
-					rm -rf /home/$USERNAME/personal
-				fi
-				mv $temp_restore_dir/home/$USERNAME/personal /home/$USERNAME
-				if [ ! "$?" = "0" ]; then
-					exit 184
-				fi
-				rm -rf $temp_restore_dir
-			fi
-		fi
-	done
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'personal' ]]; then
+            return
+        fi
+    fi
+    for d in $SERVER_DIRECTORY/backup/personal/*/ ; do
+        USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+            if [ -d $SERVER_DIRECTORY/backup/personal/$USERNAME ]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring personal settings for $USERNAME"
+                temp_restore_dir=/root/temppersonal
+                restore_directory_from_friend $temp_restore_dir personal/$USERNAME
+                if [ -d /home/$USERNAME/personal ]; then
+                    rm -rf /home/$USERNAME/personal
+                fi
+                mv $temp_restore_dir/home/$USERNAME/personal /home/$USERNAME
+                if [ ! "$?" = "0" ]; then
+                    exit 184
+                fi
+                rm -rf $temp_restore_dir
+            fi
+        fi
+    done
 }
 
 function restore_mailing_list {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'mailinglist' ]]; then
-			return
-		fi
-	fi
-	if [ -d /var/spool/mlmmj ]; then
-		echo $"Restoring public mailing list"
-		temp_restore_dir=/root/tempmailinglist
-		restore_directory_from_friend $temp_restore_dir mailinglist
-		cp -r $temp_restore_dir/root/spool/mlmmj/* /var/spool/mlmmj
-		if [ ! "$?" = "0" ]; then
-			exit 526
-		fi
-		rm -rf $temp_restore_dir
-	fi
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'mailinglist' ]]; then
+            return
+        fi
+    fi
+    if [ -d /var/spool/mlmmj ]; then
+        echo $"Restoring public mailing list"
+        temp_restore_dir=/root/tempmailinglist
+        restore_directory_from_friend $temp_restore_dir mailinglist
+        cp -r $temp_restore_dir/root/spool/mlmmj/* /var/spool/mlmmj
+        if [ ! "$?" = "0" ]; then
+            exit 526
+        fi
+        rm -rf $temp_restore_dir
+    fi
 }
 
 function restore_email {
-	if [[ $RESTORE_APP != 'all' ]]; then
-		if [[ $RESTORE_APP != 'email' ]]; then
-			return
-		fi
-	fi
-	for d in $SERVER_DIRECTORY/backup/mail/*/ ; do
-		USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
-		if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
-			if [ -d $SERVER_DIRECTORY/backup/mail/$USERNAME ]; then
-				if [ ! -d /home/$USERNAME ]; then
-					${PROJECT_NAME}-adduser $USERNAME
-				fi
-				echo $"Restoring emails for $USERNAME"
-				temp_restore_dir=/root/tempmail
-				restore_directory_from_friend $temp_restore_dir mail/$USERNAME
-				if [ ! -d /home/$USERNAME/Maildir ]; then
-					mkdir /home/$USERNAME/Maildir
-				fi
-				tar -xzvf $temp_restore_dir/root/tempbackupemail/$USERNAME/maildir.tar.gz -C /
-				if [ ! "$?" = "0" ]; then
-					exit 927
-				fi
-				rm -rf $temp_restore_dir
-			fi
-		fi
-	done
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'email' ]]; then
+            return
+        fi
+    fi
+    for d in $SERVER_DIRECTORY/backup/mail/*/ ; do
+        USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
+        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+            if [ -d $SERVER_DIRECTORY/backup/mail/$USERNAME ]; then
+                if [ ! -d /home/$USERNAME ]; then
+                    ${PROJECT_NAME}-adduser $USERNAME
+                fi
+                echo $"Restoring emails for $USERNAME"
+                temp_restore_dir=/root/tempmail
+                restore_directory_from_friend $temp_restore_dir mail/$USERNAME
+                if [ ! -d /home/$USERNAME/Maildir ]; then
+                    mkdir /home/$USERNAME/Maildir
+                fi
+                tar -xzvf $temp_restore_dir/root/tempbackupemail/$USERNAME/maildir.tar.gz -C /
+                if [ ! "$?" = "0" ]; then
+                    exit 927
+                fi
+                rm -rf $temp_restore_dir
+            fi
+        fi
+    done
 }
 
 # Social key management
@@ -654,6 +654,9 @@ restore_email
 restore_apps remote
 set_user_permissions
 
+# ensure that all TLS certificates are pinned
+${PROJECT_NAME}-pin-cert all
+
 echo $"*** Remote restore was successful ***"
 
 exit 0