diff --git a/bubble-server/src/main/java/bubble/service/account/StandardAccountMessageService.java b/bubble-server/src/main/java/bubble/service/account/StandardAccountMessageService.java
index c6564958..b2a0ad37 100644
--- a/bubble-server/src/main/java/bubble/service/account/StandardAccountMessageService.java
+++ b/bubble-server/src/main/java/bubble/service/account/StandardAccountMessageService.java
@@ -140,11 +140,12 @@ public class StandardAccountMessageService implements AccountMessageService {
             final AccountMessage request = messageDAO.findOperationRequest(approval);
             if (request == null) throw invalidEx("err.approvalToken.invalid", "Request could not be found for approval: "+approval);
             final AccountPolicy policy = policyDAO.findSingleByAccount(account.getUuid());
-            final AccountMessage confirm = messageDAO.create(new AccountMessage(approval).setMessageType(AccountMessageType.confirmation));
             approval.setRequest(request);
             approval.setRequestContact(policy.findContactByUuid(approval.getRequest().getContact()));
             getCompletionHandler(approval).confirm(approval, data);
 
+            final AccountMessage confirm = messageDAO.create(
+                    new AccountMessage(approval).setMessageType(AccountMessageType.confirmation));
             if (approval.hasConfirmationTokensToRemove()) {
                 final RedisService tokens = getConfirmationTokens();
                 for (String toRemove : approval.getConfirmationTokensToRemove()) tokens.del(toRemove);