diff --git a/src/Model/Event.php b/src/Model/Event.php
index 992b77bada..016d1f8d9e 100644
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -12,6 +12,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Map;
 
@@ -589,6 +590,12 @@ class Event extends BaseObject
 				$title = strip_tags(html_entity_decode($title, ENT_QUOTES, 'UTF-8'));
 			}
 
+			$author_link = $event['author-link'];
+			$plink       = $event['plink'];
+
+			$event['author-link'] = Contact::magicLink($author_link);
+			$event['plink']       = Contact::magicLink($author_link, $plink);
+
 			$html = self::getHTML($event);
 			$event['desc']     = BBCode::convert($event['desc']);
 			$event['location'] = BBCode::convert($event['location']);