diff --git a/lib/models/resources/ResourceBooking.class.php b/lib/models/resources/ResourceBooking.class.php
index f925cba58b5bf36d066bb13cf5da7b3d2fd56586..362d69bb7ae0f402b05f105f5cc30b9c534003f9 100644
--- a/lib/models/resources/ResourceBooking.class.php
+++ b/lib/models/resources/ResourceBooking.class.php
@@ -849,7 +849,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
@@ -871,7 +871,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
@@ -1866,7 +1866,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 229501f2de0d5b993973cc4f0133522f6aecd211..e5b33cfe566575e312ad3a30fe94738f6df389a7 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