diff --git a/app/partials/issues-detail-edit.jade b/app/partials/issues-detail-edit.jade
index 32e2aca0..4bcc146b 100644
--- a/app/partials/issues-detail-edit.jade
+++ b/app/partials/issues-detail-edit.jade
@@ -37,7 +37,6 @@ block content
             section.watchers(tg-watchers, ng-model="issue", editable="true")
 
             section.us-detail-settings
-                a.button.button-green.clickable() Promote to User Story
                 a.button.button-gray.clickable(title="Click to block the issue", ng-show="!issue.is_blocked", ng-click="ctrl.block()") Block
                 a.button.button-red(title="Click to delete the issue", tg-check-permission="delete_issue", ng-click="ctrl.delete()", href="") Delete
 
diff --git a/app/partials/issues-detail.jade b/app/partials/issues-detail.jade
index dfd6acc3..d003fe38 100644
--- a/app/partials/issues-detail.jade
+++ b/app/partials/issues-detail.jade
@@ -17,9 +17,26 @@ block content
                     h2.us-title-text
                         span.us-number(tg-bo-ref="issue.ref")
                         span.us-name(ng-bind="issue.subject")
+                    //- TODO: FIX ME
+                    h3.us-related-task(ng-if="issue.generated_user_stories")
+                        | From this issue have been generated the user stories
+                        //- a(tg-check-permission="view_us", href="", title="Go to user story",
+                        //- tg-nav="project-userstories-detail:project=project.slug, ref=us.ref",
+                        //- ng-if="us")
+                        //-     span(tg-bo-ref="us.ref")
+                        //-     span(tg-bo-bind="us.subject")
+                        ul
+                            li(ng-repeat="us in issue.generated_user_stories")
+                                a(tg-check-permission="view_us", href="", title="Go to user story",
+                                  tg-nav="project-userstories-detail:project=project.slug, ref=us.ref")
+                                    span(tg-bo-ref="us.ref")
+                                    span(tg-bo-bind="us.subject")
+                    //- END TODO
+
                     p.block-desc-container(ng-show="issue.is_blocked")
                         span.block-description-title Blocked
                         span.block-description(tg-bind-html="issue.blocked_note || 'This issue is blocked'")
+
                     div.issue-nav
                         a.icon.icon-arrow-left(ng-show="previousUrl",href="{{ previousUrl }}", title="previous issue")
                         a.icon.icon-arrow-right(ng-show="nextUrl", href="{{ nextUrl }}", title="next issue")
@@ -35,3 +52,11 @@ block content
             section.us-status(tg-issue-status, ng-model="issue")
             section.us-assigned-to(tg-assigned-to, ng-model="issue")
             section.watchers(tg-watchers, ng-model="issue")
+
+            section.us-detail-settings
+                a.button.button-green.clickable(tg-check-permission="add_us", ng-click="ctrl.promoteToUs()",
+                                                href="")
+                    Promote to User Story
+
+        div.lightbox.lightbox-generic-form.lb-create-edit-userstory(tg-lb-create-edit-userstory)
+            include views/modules/lightbox-us-create-edit
diff --git a/app/partials/us-detail.jade b/app/partials/us-detail.jade
index 235021ea..b865c047 100644
--- a/app/partials/us-detail.jade
+++ b/app/partials/us-detail.jade
@@ -26,6 +26,15 @@ block content
                         span.us-number(tg-bo-ref="us.ref")
                         span.us-name(ng-bind="us.subject")
 
+                    //- TODO: FIX ME
+                    h3.us-related-task(ng-if="us.origin_issue")
+                        | This user story comes from the issue
+                        a(tg-check-permission="view_us", href="", title="Go to issue",
+                          tg-nav="project-issues-detail:project=project.slug, ref=us.origin_issue.ref")
+                            span(tg-bo-ref="us.origin_issue.ref")
+                            span(tg-bo-bind="us.origin_issue.subject")
+                    //- END TODO
+
                     p.block-desc-container(ng-show="us.is_blocked")
                         span.block-description-title Blocked
                         span.block-description(tg-bind-html="us.blocked_note || 'This user story is blocked'")