diff --git a/services/src/main/java/org/exoplatform/task/integration/notification/AbstractNotificationPlugin.java b/services/src/main/java/org/exoplatform/task/integration/notification/AbstractNotificationPlugin.java
index 30f2c09f3..12ee6f105 100755
--- a/services/src/main/java/org/exoplatform/task/integration/notification/AbstractNotificationPlugin.java
+++ b/services/src/main/java/org/exoplatform/task/integration/notification/AbstractNotificationPlugin.java
@@ -29,6 +29,7 @@
 import org.exoplatform.container.RootContainer;
 import org.exoplatform.container.component.RequestLifeCycle;
 import org.exoplatform.container.xml.InitParams;
+import org.exoplatform.portal.config.UserPortalConfigService;
 import org.exoplatform.services.organization.OrganizationService;
 import org.exoplatform.task.dto.ProjectDto;
 import org.exoplatform.task.dto.TaskDto;
@@ -128,6 +129,10 @@ protected Set<String> getReceiver(TaskDto task, NotificationContext ctx) {
     return receivers;
   }
 
+  protected String getPortalOwner() {
+    return CommonsUtils.getService(UserPortalConfigService.class).getDefaultPortal();
+  }
+
   private String buildTaskUrl(TaskDto t, ExoContainer container, WebAppController controller) {
     return CommonsUtils.getCurrentDomain() + TaskUtil.buildTaskURL(t, CommonsUtils.getCurrentSite(), container, controller.getRouter());
   }
diff --git a/services/src/main/java/org/exoplatform/task/integration/notification/TaskCommentPlugin.java b/services/src/main/java/org/exoplatform/task/integration/notification/TaskCommentPlugin.java
index 9bbab4eb9..59a400173 100644
--- a/services/src/main/java/org/exoplatform/task/integration/notification/TaskCommentPlugin.java
+++ b/services/src/main/java/org/exoplatform/task/integration/notification/TaskCommentPlugin.java
@@ -24,6 +24,7 @@
 import org.exoplatform.commons.api.notification.NotificationContext;
 import org.exoplatform.commons.api.notification.model.NotificationInfo;
 import org.exoplatform.container.xml.InitParams;
+import org.exoplatform.social.core.utils.MentionUtils;
 import org.exoplatform.task.dto.CommentDto;
 import org.exoplatform.task.dto.TaskDto;
 
@@ -48,7 +49,7 @@ public NotificationInfo makeNotification(NotificationContext ctx) {
     CommentDto comment = ctx.value(NotificationUtils.COMMENT);
     NotificationInfo info = super.makeNotification(ctx);
     info.with(NotificationUtils.TASKS, String.valueOf(task.getId()));
-    info.with(NotificationUtils.COMMENT_TEXT, comment.getComment());
+    info.with(NotificationUtils.COMMENT_TEXT, MentionUtils.substituteUsernames(getPortalOwner(), comment.getComment()));
     // Override the activityId
     String projectId = "project.";
     if (task.getStatus() != null && task.getStatus().getProject() != null) {
diff --git a/services/src/main/java/org/exoplatform/task/integration/notification/TaskMentionPlugin.java b/services/src/main/java/org/exoplatform/task/integration/notification/TaskMentionPlugin.java
index 30c3d1971..cf968b6df 100644
--- a/services/src/main/java/org/exoplatform/task/integration/notification/TaskMentionPlugin.java
+++ b/services/src/main/java/org/exoplatform/task/integration/notification/TaskMentionPlugin.java
@@ -24,6 +24,7 @@
 import org.exoplatform.commons.api.notification.NotificationContext;
 import org.exoplatform.commons.api.notification.model.NotificationInfo;
 import org.exoplatform.container.xml.InitParams;
+import org.exoplatform.social.core.utils.MentionUtils;
 import org.exoplatform.task.dto.CommentDto;
 import org.exoplatform.task.dto.TaskDto;
 
@@ -47,7 +48,7 @@ public NotificationInfo makeNotification(NotificationContext ctx) {
     TaskDto task = ctx.value(NotificationUtils.TASK);
     CommentDto comment = ctx.value(NotificationUtils.COMMENT);
     NotificationInfo info = super.makeNotification(ctx);
-    info.with(NotificationUtils.COMMENT_TEXT, comment.getComment());
+    info.with(NotificationUtils.COMMENT_TEXT, MentionUtils.substituteUsernames(getPortalOwner(), comment.getComment()));
     // Override the activityId
     String projectId = "project.";
     if (task.getStatus() != null && task.getStatus().getProject() != null) {