diff --git a/src/Entity/Domain.php b/src/Entity/Domain.php
index 138f304..d1e3cb5 100644
--- a/src/Entity/Domain.php
+++ b/src/Entity/Domain.php
@@ -479,8 +479,13 @@ class Domain
     /**
      * @throws \DateMalformedIntervalStringException
      */
-    private function calculateDaysFromStatus($lastStatus, \DateTimeImmutable $now): ?int
+    private function calculateDaysFromStatus(\DateTimeImmutable $now): ?int
     {
+        $lastStatus = $this->getDomainStatuses()->last();
+        if (false === $lastStatus) {
+            return null;
+        }
+
         if (in_array('pending delete', $lastStatus->getAddStatus()) && !$this->isRedemptionPeriod()) {
             return self::daysBetween($now, $lastStatus->getCreatedAt()->add(new \DateInterval('P'. 6 .'D')));
         }
@@ -491,6 +496,25 @@ class Domain
         return null;
     }
 
+    /*
+    private function calculateDaysFromEvents(\DateTimeImmutable $now): ?int
+    {
+        $lastChangedEvent = $this->getEvents()->findFirst(fn (int $i, DomainEvent $e) => !$e->getDeleted() && EventAction::LastChanged->value === $e->getAction());
+        if (null === $lastChangedEvent) {
+            return null;
+        }
+
+        if ($this->isRedemptionPeriod()) {
+            return self::daysBetween($now, $lastChangedEvent->getDate()->add(new \DateInterval('P'.(30 + 6).'D')));
+        }
+        if ($this->isPendingDelete()) {
+            return self::daysBetween($now, $lastChangedEvent->getDate()->add(new \DateInterval('P'. 6 .'D')));
+        }
+
+        return null;
+    }
+    */
+
     private static function daysBetween(\DateTimeImmutable $start, \DateTimeImmutable $end): int
     {
         $interval = $start->setTime(0, 0)->diff($end->setTime(0, 0));
@@ -498,9 +522,17 @@ class Domain
         return $interval->invert ? -$interval->days : $interval->days;
     }
 
-    private static function returnExpiresIn(int $guess1, int $guess2)
+    private static function returnExpiresIn(array $guesses): ?int
     {
-        return $guess1 < 0 ? $guess2 : ($guess2 < 0 ? $guess1 : min($guess1, $guess2));
+        $filteredGuesses = array_filter($guesses, function ($value) {
+            return null !== $value && $value >= 0;
+        });
+
+        if (empty($filteredGuesses)) {
+            return null;
+        }
+
+        return min($filteredGuesses);
     }
 
     /**
@@ -529,28 +561,24 @@ class Domain
     public function getExpiresInDays(): ?int
     {
         $now = new \DateTimeImmutable();
-        $lastStatus = $this->getDomainStatuses()->last();
-        $daysToExpiration = $lastStatus ? $this->calculateDaysFromStatus($lastStatus, $now) : null;
-
         [$expiredAt, $deletedAt] = $this->getRelevantDates();
 
         if ($deletedAt) {
             // It has been observed that AFNIC, on the last day, adds a "deleted" event and removes the redemption period status.
-            if (0 === self::daysBetween($now, $deletedAt) && in_array('pending delete', $this->getStatus())) {
+            if (0 === self::daysBetween($now, $deletedAt) && $this->isPendingDelete()) {
                 return 0;
             }
 
             $guess = self::daysBetween($now, $deletedAt->add(new \DateInterval('P'. 30 .'D')));
-
-            return self::returnExpiresIn($guess, $daysToExpiration ?? $guess);
         }
 
         if ($expiredAt) {
             $guess = self::daysBetween($now, $expiredAt->add(new \DateInterval('P'.(45 + 30 + 6).'D')));
-
-            return self::returnExpiresIn($guess, $daysToExpiration ?? $guess);
         }
 
-        return null;
+        return self::returnExpiresIn([
+            $guess ?? null,
+            $this->calculateDaysFromStatus($now),
+        ]);
     }
 }
diff --git a/src/Notifier/DomainDeletedNotification.php b/src/Notifier/DomainDeletedNotification.php
index 29aabdc..84da9ea 100644
--- a/src/Notifier/DomainDeletedNotification.php
+++ b/src/Notifier/DomainDeletedNotification.php
@@ -5,6 +5,7 @@ namespace App\Notifier;
 use App\Entity\Domain;
 use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Component\Mime\Address;
+use Symfony\Component\Mime\Email;
 use Symfony\Component\Notifier\Message\ChatMessage;
 use Symfony\Component\Notifier\Message\EmailMessage;
 use Symfony\Component\Notifier\Message\PushMessage;
@@ -48,6 +49,7 @@ class DomainDeletedNotification extends DomainWatchdogNotification
         return new EmailMessage((new TemplatedEmail())
             ->from($this->sender)
             ->to($recipient->getEmail())
+            ->priority(Email::PRIORITY_HIGHEST)
             ->subject("Domain name $ldhName has been removed from WHOIS")
             ->htmlTemplate('emails/errors/domain_deleted.html.twig')
             ->locale('en')
diff --git a/src/Notifier/DomainOrderErrorNotification.php b/src/Notifier/DomainOrderErrorNotification.php
index 06f0d59..2e0b5c9 100644
--- a/src/Notifier/DomainOrderErrorNotification.php
+++ b/src/Notifier/DomainOrderErrorNotification.php
@@ -5,6 +5,7 @@ namespace App\Notifier;
 use App\Entity\Domain;
 use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Component\Mime\Address;
+use Symfony\Component\Mime\Email;
 use Symfony\Component\Notifier\Message\ChatMessage;
 use Symfony\Component\Notifier\Message\EmailMessage;
 use Symfony\Component\Notifier\Message\PushMessage;
@@ -48,6 +49,7 @@ class DomainOrderErrorNotification extends DomainWatchdogNotification
         return new EmailMessage((new TemplatedEmail())
             ->from($this->sender)
             ->to($recipient->getEmail())
+            ->priority(Email::PRIORITY_HIGH)
             ->subject("Domain name $ldhName tried to be purchased")
             ->htmlTemplate('emails/errors/domain_order.html.twig')
             ->locale('en')
diff --git a/src/Notifier/DomainOrderNotification.php b/src/Notifier/DomainOrderNotification.php
index d1eba48..8ee51ee 100644
--- a/src/Notifier/DomainOrderNotification.php
+++ b/src/Notifier/DomainOrderNotification.php
@@ -30,7 +30,7 @@ class DomainOrderNotification extends DomainWatchdogNotification
         $this
             ->subject("Success: Domain Ordered $ldhName!")
             ->content("Domain name $ldhName has just been purchased. The API provider did not return an error.")
-            ->importance(Notification::IMPORTANCE_HIGH);
+            ->importance(Notification::IMPORTANCE_URGENT);
 
         return ChatMessage::fromNotification($this);
     }
@@ -41,7 +41,7 @@ class DomainOrderNotification extends DomainWatchdogNotification
         $this
             ->subject("Success: Domain Ordered $ldhName!")
             ->content("Domain name $ldhName has just been purchased. The API provider did not return an error.")
-            ->importance(Notification::IMPORTANCE_HIGH);
+            ->importance(Notification::IMPORTANCE_URGENT);
 
         return PushMessage::fromNotification($this);
     }
diff --git a/src/Notifier/DomainUpdateErrorNotification.php b/src/Notifier/DomainUpdateErrorNotification.php
index 5a82af6..ab9cf96 100644
--- a/src/Notifier/DomainUpdateErrorNotification.php
+++ b/src/Notifier/DomainUpdateErrorNotification.php
@@ -5,6 +5,7 @@ namespace App\Notifier;
 use App\Entity\Domain;
 use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Component\Mime\Address;
+use Symfony\Component\Mime\Email;
 use Symfony\Component\Notifier\Message\ChatMessage;
 use Symfony\Component\Notifier\Message\EmailMessage;
 use Symfony\Component\Notifier\Message\PushMessage;
@@ -48,6 +49,7 @@ class DomainUpdateErrorNotification extends DomainWatchdogNotification
         return new EmailMessage((new TemplatedEmail())
             ->from($this->sender)
             ->to($recipient->getEmail())
+            ->priority(Email::PRIORITY_NORMAL)
             ->subject("Domain name $ldhName tried to be updated")
             ->htmlTemplate('emails/errors/domain_update.html.twig')
             ->locale('en')
diff --git a/src/Notifier/DomainUpdateNotification.php b/src/Notifier/DomainUpdateNotification.php
index 19f4908..37134b7 100644
--- a/src/Notifier/DomainUpdateNotification.php
+++ b/src/Notifier/DomainUpdateNotification.php
@@ -51,7 +51,7 @@ class DomainUpdateNotification extends DomainWatchdogNotification
         return new EmailMessage((new TemplatedEmail())
             ->from($this->sender)
             ->to($recipient->getEmail())
-            ->priority(Email::PRIORITY_HIGHEST)
+            ->priority(Email::PRIORITY_HIGH)
             ->subject("Domain name $ldhName information has been updated")
             ->htmlTemplate('emails/success/domain_updated.html.twig')
             ->locale('en')
diff --git a/src/Notifier/ValidateConnectorCredentialsErrorNotification.php b/src/Notifier/ValidateConnectorCredentialsErrorNotification.php
index a1927da..544711a 100644
--- a/src/Notifier/ValidateConnectorCredentialsErrorNotification.php
+++ b/src/Notifier/ValidateConnectorCredentialsErrorNotification.php
@@ -5,6 +5,7 @@ namespace App\Notifier;
 use App\Entity\Connector;
 use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Component\Mime\Address;
+use Symfony\Component\Mime\Email;
 use Symfony\Component\Notifier\Message\EmailMessage;
 use Symfony\Component\Notifier\Notification\Notification;
 use Symfony\Component\Notifier\Recipient\EmailRecipientInterface;
@@ -23,6 +24,7 @@ class ValidateConnectorCredentialsErrorNotification extends Notification
         return new EmailMessage((new TemplatedEmail())
             ->from($this->sender)
             ->to($recipient->getEmail())
+            ->priority(Email::PRIORITY_HIGH)
             ->subject('Connector credentials error')
             ->htmlTemplate('emails/errors/connector_credentials.html.twig')
             ->locale('en')