diff --git a/lib/Qpsmtpd/SMTP.pm b/lib/Qpsmtpd/SMTP.pm
index fe8e63e..ba8885a 100644
--- a/lib/Qpsmtpd/SMTP.pm
+++ b/lib/Qpsmtpd/SMTP.pm
@@ -783,6 +783,8 @@ sub data_respond {
         return 1;
     }
 
+    $self->authentication_results();
+    $self->received_line();
     $self->run_hooks("data_post");
 }
 
@@ -919,8 +921,6 @@ sub data_post_respond {
         return 1;
     }
     else {
-        $self->authentication_results();
-        $self->received_line();
         $self->queue($self->transaction);
     }
 }