diff --git a/lib/models/resources/ResourceBooking.class.php b/lib/models/resources/ResourceBooking.class.php
index fe4e4be817b57905c684d3591b683c2a836975df..d7c1b2f8b9ae10ebb3ea245ca98576f1c8fca260 100644
--- a/lib/models/resources/ResourceBooking.class.php
+++ b/lib/models/resources/ResourceBooking.class.php
@@ -848,7 +848,7 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen
                 $mail_text = $template->render();
 
                 Message::send(
-                    '____%system%____',
+                    User::findCurrent()->id,
                     [$reservation->assigned_user->username],
                     _('Reservierung überbucht'),
                     $mail_text
@@ -870,7 +870,7 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen
                 $mail_text = $template->render();
 
                 Message::send(
-                    '____%system%____',
+                    User::findCurrent()->id,
                     [$reservation->booking_user->username],
                     _('Reservierung überbucht'),
                     $mail_text
@@ -1865,7 +1865,7 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen
         $mail_text = $template->render();
 
         Message::send(
-            '____%system%____',
+            User::findCurrent()->id,
             [$booking_user->username],
             _('Ihre Buchung wurde gelöscht'),
             $mail_text
diff --git a/lib/models/resources/ResourceRequest.class.php b/lib/models/resources/ResourceRequest.class.php
index b66fb54072c3acba43a6c46cc1d07af52d488c04..648d83c9c6df69afda3fb67af6a39c772bfb9df5 100644
--- a/lib/models/resources/ResourceRequest.class.php
+++ b/lib/models/resources/ResourceRequest.class.php
@@ -1908,7 +1908,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
             }
 
             Message::send(
-                '____%system%____',
+                User::findCurrent()->id,
                 $user->username,
                 $mail_title,
                 $mail_text
@@ -1990,7 +1990,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
         $mail_text  = $template->render();
 
         Message::send(
-            '____%system%____',
+            User::findCurrent()->id,
             $this->user->username,
             $mail_title,
             $mail_text
@@ -2079,7 +2079,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
                     $mail_text  = $template->render();
 
                     Message::send(
-                        '____%system%____',
+                        User::findCurrent()->id,
                         $lecturer->user->username,
                         $mail_title,
                         $mail_text
@@ -2128,7 +2128,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
 
         //Send the mail:
         Message::send(
-            '____%system%____',
+            User::findCurrent()->id,
             $user->username,
             $mail_title,
             $mail_text