diff --git a/application/models/CL/Messages_model.php b/application/models/CL/Messages_model.php
index ac3a16e3e..f24e16086 100644
--- a/application/models/CL/Messages_model.php
+++ b/application/models/CL/Messages_model.php
@@ -467,8 +467,9 @@ class Messages_model extends CI_Model
 
 		$prestudentsData = $this->PrestudentModel->getOrganisationunits($prestudents);
 		
-		// Get the senders uid
+		// Get the senders uid (if user is an active employee)
 		$this->BenutzerModel->addSelect('uid');
+		$this->BenutzerModel->addJoin('public.tbl_mitarbeiter ma', 'ma.mitarbeiter_uid = uid');
 		if (!$result = getData($this->BenutzerModel->getFromPersonId($sender_id)))
 		{
 			show_error('No sender_uid found');