diff --git a/src/freedombone-backup-local b/src/freedombone-backup-local
index 482f6162..5510a46b 100755
--- a/src/freedombone-backup-local
+++ b/src/freedombone-backup-local
@@ -373,6 +373,7 @@ if [[ $1 == "remove" ]]; then
     remove_option=$1
 fi
 
+gpg_agent_setup root
 backup_mount_drive $1 $2
 remove_backup_directory $remove_option
 make_backup_directory
diff --git a/src/freedombone-backup-remote b/src/freedombone-backup-remote
index 69e3f529..c272bb9c 100755
--- a/src/freedombone-backup-remote
+++ b/src/freedombone-backup-remote
@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
+# Copyright (C) 2015-2018 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -430,6 +430,7 @@ if [[ "$1" == "test" ]]; then
     TEST_MODE="yes"
 fi
 
+gpg_agent_setup root
 backup_configfiles
 if [[ $TEST_MODE == "no" ]]; then
     backup_blocklist
diff --git a/src/freedombone-restore-local b/src/freedombone-restore-local
index bacbe5cb..74a89429 100755
--- a/src/freedombone-restore-local
+++ b/src/freedombone-restore-local
@@ -956,6 +956,7 @@ backup_mount_drive ${1} ${ADMIN_USERNAME} ${2}
 check_backup_exists
 check_admin_user
 copy_gpg_keys
+gpg_agent_setup root
 restore_blocklist
 restore_configfiles
 same_admin_user
diff --git a/src/freedombone-restore-remote b/src/freedombone-restore-remote
index 61226fdc..4cc0be8c 100755
--- a/src/freedombone-restore-remote
+++ b/src/freedombone-restore-remote
@@ -857,6 +857,7 @@ function restore_email {
 ${PROJECT_NAME}-recoverkey -u ${ADMIN_USERNAME} -l $BACKUP_LIST
 
 copy_gpg_keys
+gpg_agent_setup root
 restore_blocklist
 restore_configfiles
 restore_passwordstore