diff --git a/phpgwapi/inc/class.smtp.php b/phpgwapi/inc/class.smtp.php
index 8cefb83e11..55803156f3 100644
--- a/phpgwapi/inc/class.smtp.php
+++ b/phpgwapi/inc/class.smtp.php
@@ -576,6 +576,7 @@ class SMTP {
     }
 
     if($code != 250) {
+      $this->Reset();
       $this->error =
         array("error" => "MAIL not accepted from server",
               "smtp_code" => $code,
@@ -671,6 +672,7 @@ class SMTP {
     }
 
     if($code != 250 && $code != 251) {
+      $this->Reset();
       $this->error =
         array("error" => "RCPT not accepted from server",
               "smtp_code" => $code,