diff --git a/app/Domain/Notifications/Services/Notifications.php b/app/Domain/Notifications/Services/Notifications.php
index 71d44425d..8042d1bf4 100644
--- a/app/Domain/Notifications/Services/Notifications.php
+++ b/app/Domain/Notifications/Services/Notifications.php
@@ -146,10 +146,11 @@ public function processMentions(string $content, string $module, int $moduleId,
                         $subject = sprintf($this->language->__('text.x_mentioned_you'), $authorName);
                         $mailer->setSubject($subject);
 
-                        $emailMessage = $subject;
-                        $emailMessage .= sprintf($this->language->__('text.click_here'), $url);
+                        $emailMessage = $subject . '. ';
+                        $emailMessage .= sprintf('<a href="%s">%s</a>', $url, $this->language->__('text.click_here'));
                         $mailer->setHtml($emailMessage);
-                        $mailer->sendMail(array($taggedUser), $authorName);
+                        $recipient = $this->userRepository->getUser($taggedUser)['username'];
+                        $mailer->sendMail(array($recipient), $authorName);
                     }
                 }
             }
diff --git a/app/Domain/Tickets/Templates/showTicketModal.tpl.php b/app/Domain/Tickets/Templates/showTicketModal.tpl.php
index 3f8d45e9b..969e99c4f 100644
--- a/app/Domain/Tickets/Templates/showTicketModal.tpl.php
+++ b/app/Domain/Tickets/Templates/showTicketModal.tpl.php
@@ -13,7 +13,7 @@
     window.onload = function() {
         if (!window.jQuery) {
             //It's not a modal
-            location.href="<?=BASE_URL ?>/tickets/showKanban?showTicketModal=<?php echo $ticket->id; ?>";
+            location.href="<?=BASE_URL ?>/tickets/showKanban#/tickets/showTicket/<?php echo $ticket->id; ?>";
         }
     }
 </script>