diff --git a/app/locales/locale-en.json b/app/locales/locale-en.json
index ca36f458..d54531fb 100644
--- a/app/locales/locale-en.json
+++ b/app/locales/locale-en.json
@@ -1225,6 +1225,7 @@
         "US_CREATED": "{{username}} has created a new US {{obj_name}} in {{project_name}}",
         "ISSUE_CREATED": "{{username}} has created a new issue {{obj_name}} in {{project_name}}",
         "TASK_CREATED": "{{username}} has created a new task {{obj_name}} in {{project_name}}",
+        "TASK_CREATED_WITH_US": "{{username}} has created a new task {{obj_name}} in {{project_name}} which belongs to the US {{us_name}}",
         "WIKI_CREATED": "{{username}} has created a new wiki page {{obj_name}} in {{project_name}}",
         "MILESTONE_CREATED": "{{username}} has created a new sprint {{obj_name}} in {{project_name}}",
         "NEW_PROJECT": "{{username}} created the project {{project_name}}",
diff --git a/app/modules/user-timeline/user-timeline-item/user-timeline-item-type.service.coffee b/app/modules/user-timeline/user-timeline-item/user-timeline-item-type.service.coffee
index b2a2e803..06caf41f 100644
--- a/app/modules/user-timeline/user-timeline-item/user-timeline-item-type.service.coffee
+++ b/app/modules/user-timeline/user-timeline-item/user-timeline-item-type.service.coffee
@@ -45,10 +45,16 @@ timelineType = (timeline, event) ->
         },
         { # NewTask
             check: (timeline, event) ->
-                return event.obj == 'task' && event.type == 'create'
+                return event.obj == 'task' && event.type == 'create' && !timeline.data.task.userstory
             key: 'TIMELINE.TASK_CREATED',
             translate_params: ['username', 'project_name', 'obj_name']
         },
+        { # NewTask with US
+            check: (timeline, event) ->
+                return event.obj == 'task' && event.type == 'create' && timeline.data.task.userstory
+            key: 'TIMELINE.TASK_CREATED_WITH_US',
+            translate_params: ['username', 'project_name', 'obj_name', 'us_name']
+        },
         { # NewMilestone
             check: (timeline, event) ->
                 return event.obj == 'milestone' && event.type == 'create'