diff --git a/Kernel/System/Mention.pm b/Kernel/System/Mention.pm
index 53b84435fcc..446a8687658 100644
--- a/Kernel/System/Mention.pm
+++ b/Kernel/System/Mention.pm
@@ -645,7 +645,7 @@ sub GetMentionedUserIDsFromString {
         push @UniqueMentionedUsers, $MentionedUser;
     }
 
-    if ( $Param{Limit} ) {
+    if ( $Param{Limit} && @UniqueMentionedUsers > $Param{Limit} ) {
         @UniqueMentionedUsers = @UniqueMentionedUsers[ 0 .. $Param{Limit} - 1 ];
     }
 
diff --git a/var/httpd/htdocs/js/Znuny.Agent.MentionAction.js b/var/httpd/htdocs/js/Znuny.Agent.MentionAction.js
index e70ac063926..a088ccaca2a 100644
--- a/var/httpd/htdocs/js/Znuny.Agent.MentionAction.js
+++ b/var/httpd/htdocs/js/Znuny.Agent.MentionAction.js
@@ -23,7 +23,8 @@ Znuny.Agent.MentionAction = (function (TargetNS) {
         };
 
         $('.MentionRow').each(function() {
-            $(this).on('click', function() {
+            $(this).on('click', function(Event) {
+                Event.preventDefault();
                 Data.MentionedUserID = $(this).attr('data-user-id');
 
                 Core.AJAX.FunctionCall(
diff --git a/var/httpd/htdocs/js/Znuny.Agent.TicketMention.js b/var/httpd/htdocs/js/Znuny.Agent.TicketMention.js
index 24d95c7de23..67927ece4c2 100644
--- a/var/httpd/htdocs/js/Znuny.Agent.TicketMention.js
+++ b/var/httpd/htdocs/js/Znuny.Agent.TicketMention.js
@@ -22,7 +22,9 @@ Znuny.Agent.TicketMention = (function (TargetNS) {
             BulkAction: 1
         };
 
-        $('#RemoveMention').on('click',function(){
+        $('#RemoveMention').on('click',function(Event){
+            Event.preventDefault();
+
             $('.MasterAction').each(function(){
                 var TicketID  = $(this).attr('id').replace('TicketID_', '');
                 Data.TicketID = TicketID;