diff --git a/app/Mail/OrderArrived.php b/app/Mail/OrderArrived.php
index 588972c..ffa0a18 100644
--- a/app/Mail/OrderArrived.php
+++ b/app/Mail/OrderArrived.php
@@ -2,6 +2,7 @@
 
 namespace App\Mail;
 
+use App\Filament\Resources\Orders\OrderResource;
 use App\Models\Order;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -41,6 +42,10 @@ class OrderArrived extends Mailable
     {
         return new Content(
             markdown: 'mail.order-arrived',
+            with: [
+                'url' => OrderResource::getUrl('edit', ['record' => $this->order]),
+                'order' => $this->order,
+            ],
         );
     }
 
diff --git a/app/Mail/OrderRegistered.php b/app/Mail/OrderRegistered.php
index edc0262..915f04d 100644
--- a/app/Mail/OrderRegistered.php
+++ b/app/Mail/OrderRegistered.php
@@ -2,6 +2,7 @@
 
 namespace App\Mail;
 
+use App\Filament\Resources\Orders\OrderResource;
 use App\Models\Order;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -41,6 +42,10 @@ class OrderRegistered extends Mailable
     {
         return new Content(
             markdown: 'mail.order-registered',
+            with: [
+                'url' => OrderResource::getUrl('edit', ['record' => $this->order]),
+                'order' => $this->order,
+            ],
         );
     }
 
diff --git a/app/Observers/OrderObserver.php b/app/Observers/OrderObserver.php
index fdd79d1..118a641 100644
--- a/app/Observers/OrderObserver.php
+++ b/app/Observers/OrderObserver.php
@@ -28,15 +28,13 @@ class OrderObserver
      */
     public function updated(Order $order): void
     {
-        $hasChanged = array_diff($order->getOriginal(), $order->getAttributes());
+        $hasChanged = $order->getChanges();
         if($hasChanged && isset($hasChanged['orderstatus_id'])) {
-            $orderstatusOrdered = Orderstatus::where("name", "bestellt")->first();
-            if($order->orderstatus_id == $orderstatusOrdered->id) {
-                $order->orderdatetime = Carbon::now()->toDateTimeString();
+            if($order->orderstatus->name == "bestellt") {
+                $order->orderdatetime = $order->updated_at;
                 $order->saveQuietly();
             }
-            $orderstatusArrived = Orderstatus::where("name", "angekommen")->first();
-            if($order->orderstatus_id == $orderstatusArrived->id) {
+            if($order->orderstatus->name == "angekommen") {
                 $user = User::find($order->user_id);
                 Mail::to($user)->send(new OrderArrived($order));
             }
diff --git a/resources/views/mail/order-arrived.blade.php b/resources/views/mail/order-arrived.blade.php
index 4dc7c8c..5dd4605 100644
--- a/resources/views/mail/order-arrived.blade.php
+++ b/resources/views/mail/order-arrived.blade.php
@@ -2,10 +2,15 @@
 # Bestellung angekommen
 
 Eine deiner Bestellungen ist angekommen.
+
+* Name: {{ $order->name }}
+* Anzahl: {{ $order->count }}
+* <a href="{{ $order->url }}">{{ $order->url }}</a>
+
 Bitte nicht vergessen, die Bestellung "abzuhaken", indem du auf "angenommen" drückst
 
-<x-mail::button :url="'https://z-lab-cockpit.digital-infinity.de/orders'">
-Zum Cockpit
+<x-mail::button :url="$url">
+Zur Bestellung
 </x-mail::button>
 
 Danke,<br>
diff --git a/resources/views/mail/order-registered.blade.php b/resources/views/mail/order-registered.blade.php
index 3205825..d2f1bd0 100644
--- a/resources/views/mail/order-registered.blade.php
+++ b/resources/views/mail/order-registered.blade.php
@@ -3,10 +3,14 @@
 
 Hi,
 
-es gibt eine neue Bestellung.
+es gibt eine neue Bestellung:
+* Name: {{ $order->name }}
+* Anzahl: {{ $order->count }}
+* <a href="{{ $order->url }}">{{ $order->url }}</a>
+* Bestellt von: {{ $order->user->name }}
 
-<x-mail::button :url="'https://z-lab-cockpit.digital-infinity.de/orders'">
-Zum Cockpit
+<x-mail::button :url="$url">
+Zur Bestellung
 </x-mail::button>
 
 Danke,<br>