1 files changed, 4 insertions, 9 deletions

diff --git a/src/mailman_pgp/workflows/base.py b/src/mailman_pgp/workflows/base.py
index 1e6b867..3c276cf 100644
--- a/src/mailman_pgp/workflows/base.py
+++ b/src/mailman_pgp/workflows/base.py
@@ -64,8 +64,6 @@ class PubkeyMixin:
             self.pubkey = None
 
     def _step_pubkey_checks(self):
-        self.push('restore_subscriber')
-
         pgp_address = PGPAddress.for_address(self.address)
 
         if pgp_address is not None:
@@ -95,6 +93,9 @@ class PubkeyMixin:
         raise StopIteration
 
     def _step_receive_key(self):
+        self._restore_subscriber()
+        self._set_token(TokenOwner.no_one)
+
         pgp_address = PGPAddress.for_address(self.address)
         if pgp_address is None or pgp_address.key is None:
             # The workflow was confirmed but we still dont have an address
@@ -126,11 +127,5 @@ class PubkeyMixin:
         raise StopIteration
 
     def _step_receive_key_confirmation(self):
+        self._restore_subscriber()
         self._set_token(TokenOwner.no_one)
-
-    def _step_restore_subscriber(self):
-        if self.which is WhichSubscriber.address:
-            self.subscriber = self.address
-        else:
-            assert self.which is WhichSubscriber.user
-            self.subscriber = self.user