diff --git a/src/QUI/ERP/Coupons/CouponCode.php b/src/QUI/ERP/Coupons/CouponCode.php
index ff0f3bf5bbd5d620b2db0eedcc538eb0d08adf96..2a88c57b192be86b1960bcc4a7ef869d2784592b 100644
--- a/src/QUI/ERP/Coupons/CouponCode.php
+++ b/src/QUI/ERP/Coupons/CouponCode.php
@@ -3,9 +3,9 @@
 namespace QUI\ERP\Coupons;
 
 use QUI;
+use QUI\ERP\Discount\Handler as DiscountHandler;
 use QUI\ERP\Order\OrderInterface;
 use QUI\Permissions\Permission;
-use QUI\ERP\Discount\Handler as DiscountHandler;
 
 /**
  * Class CouponCode
@@ -156,6 +156,7 @@ public function __construct(int $id)
 
         if (!empty($data['validUntilDate'])) {
             $this->ValidUntilDate = new \DateTime($data['validUntilDate']);
+            $this->ValidUntilDate->setTime(23, 59, 59);
         }
 
         $this->checkValidity();
@@ -638,8 +639,6 @@ protected function checkValidity()
 
             if ($usedByAllUsers) {
                 $this->valid = false;
-
-                return;
             }
         }
     }
@@ -747,7 +746,7 @@ public function addToOrder(QUI\ERP\Order\OrderInProcess $Order)
                 }
 
                 return $customData['package'] === 'quiqqer/coupon'
-                       && $customData['code'] === $code;
+                    && $customData['code'] === $code;
             }
 
             return false;