diff --git a/module/my/control.php b/module/my/control.php
index b68717889f..2037dcd998 100644
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -118,7 +118,14 @@ class my extends control
         $moduleIndex = array_search('my', $this->lang->noMenuModule);
         if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
 
-        echo $this->fetch('my', $mode, "type=$type&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
+        if($mode == 'story' or $mode == 'requirement')
+        {
+            echo $this->fetch('my', 'story', "type=$type&storyType=$mode&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
+        }
+        else
+        {
+            echo $this->fetch('my', $mode, "type=$type&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
+        }
     }
 
     /**
diff --git a/module/my/lang/de.php b/module/my/lang/de.php
index 9e84880355..7e480481ce 100644
--- a/module/my/lang/de.php
+++ b/module/my/lang/de.php
@@ -28,8 +28,6 @@ $lang->my->limited        = 'Eingeschränkte Möglichkeiten (Bearbeiten nur eige
 $lang->my->score          = 'Meine Wertung';
 $lang->my->scoreRule      = 'Wertungs regeln';
 $lang->my->noTodo         = 'Keine toDos. ';
-$lang->my->requirement    = 'User requirements';
-$lang->my->story          = 'Software requirements';
 
 $lang->my->myExecutions = 'My Stage/Sprint/Iteration';
 $lang->my->name         = 'Name';
diff --git a/module/my/lang/en.php b/module/my/lang/en.php
index 51a1bb20e0..b84a7d9f98 100644
--- a/module/my/lang/en.php
+++ b/module/my/lang/en.php
@@ -28,8 +28,6 @@ $lang->my->limited        = 'Limited Actions (Users can only edit what involves
 $lang->my->score          = 'My Points';
 $lang->my->scoreRule      = 'Point Rules';
 $lang->my->noTodo         = 'No todos yet. ';
-$lang->my->requirement    = 'User requirements';
-$lang->my->story          = 'Software requirements';
 
 $lang->my->myExecutions = "My Stage/Sprint/Iteration";
 $lang->my->name         = 'Name';
diff --git a/module/my/lang/fr.php b/module/my/lang/fr.php
index c498380df7..8c439ced7c 100644
--- a/module/my/lang/fr.php
+++ b/module/my/lang/fr.php
@@ -28,8 +28,6 @@ $lang->my->limited        = 'Actions Limitées (Les utilisateurs peuvent seuleme
 $lang->my->score          = 'Mes Points';
 $lang->my->scoreRule      = 'Règles Point';
 $lang->my->noTodo         = "Je n'ai rien à faire pour l'instant.";
-$lang->my->requirement    = 'User requirements';
-$lang->my->story          = 'Software requirements';
 
 $lang->my->myExecutions = 'My Stage/Sprint/Iteration';
 $lang->my->name         = 'Name';
diff --git a/module/my/lang/vi.php b/module/my/lang/vi.php
index 5b0b817502..abbbce0400 100644
--- a/module/my/lang/vi.php
+++ b/module/my/lang/vi.php
@@ -28,8 +28,6 @@ $lang->my->limited        = 'Hành động bị giới hạn (Người dùng ch
 $lang->my->score          = 'Điểm của bạn';
 $lang->my->scoreRule      = 'Quy định điểm';
 $lang->my->noTodo         = 'Chưa có việc nào.';
-$lang->my->requirement    = 'User requirements';
-$lang->my->story          = 'Software requirements';
 
 $lang->my->myExecutions = "My Stage/Sprint/Iteration";
 $lang->my->name         = 'Name';
diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php
index 11c6cc7234..6998606f61 100644
--- a/module/my/lang/zh-cn.php
+++ b/module/my/lang/zh-cn.php
@@ -30,8 +30,6 @@ $lang->my->limited        = '受限操作(只能编辑与自己相关的内容)'
 $lang->my->score          = '我的积分';
 $lang->my->scoreRule      = '积分规则';
 $lang->my->noTodo         = '暂时没有待办。';
-$lang->my->requirement    = '用户需求';
-$lang->my->story          = '软件需求';
 
 $lang->my->myExecutions = "我参与的阶段/冲刺/迭代";
 $lang->my->name         = '名称';
diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php
index f9183ccb90..2fb93ed28a 100644
--- a/module/my/view/story.html.php
+++ b/module/my/view/story.html.php
@@ -16,13 +16,13 @@
   <div class="btn-toolbar pull-left">
     <?php
     $recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
-    echo "<span class='nav-title'>{$lang->my->requirement}</span>";
+    echo "<span class='nav-title'>{$lang->productURCommon}</span>";
     echo html::a(inlink($app->rawMethod, "mode=requirement&type=assignedTo"), "<span class='text'>{$lang->my->storyMenu->assignedToMe}</span>" . ($type == 'assignedTo' && $mode == 'requirement' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assignedTo' && $mode == 'requirement' ? ' btn-active-text' : '') . "'");
     echo html::a(inlink($app->rawMethod, "mode=requirement&type=openedBy"),   "<span class='text'>{$lang->my->storyMenu->openedByMe}</span>"   . ($type == 'openedBy'   && $mode == 'requirement' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'openedBy'   && $mode == 'requirement' ? ' btn-active-text' : '') . "'");
     echo html::a(inlink($app->rawMethod, "mode=requirement&type=reviewedBy"), "<span class='text'>{$lang->my->storyMenu->reviewedByMe}</span>" . ($type == 'reviewedBy' && $mode == 'requirement' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'reviewedBy' && $mode == 'requirement' ? ' btn-active-text' : '') . "'");
     if($app->rawMethod == 'contribute') echo html::a(inlink($app->rawMethod, "mode=requirement&type=closedBy"),   "<span class='text'>{$lang->my->storyMenu->closedByMe}</span>"   . ($type == 'closedBy'   & $mode == 'requirement' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'closedBy'   & $mode == 'requirement' ? ' btn-active-text' : '') . "'");
     echo "<span class='nav-title'> | </span>";
-    echo "<span class='nav-title'>{$lang->my->story}</span>";
+    echo "<span class='nav-title'>{$lang->productSRCommon}</span>";
     echo html::a(inlink($app->rawMethod, "mode=story&type=assignedTo"), "<span class='text'>{$lang->my->storyMenu->assignedToMe}</span>" . ($type == 'assignedTo' && $mode == 'story' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assignedTo' && $mode == 'story' ? ' btn-active-text' : '') . "'");
     echo html::a(inlink($app->rawMethod, "mode=story&type=openedBy"),   "<span class='text'>{$lang->my->storyMenu->openedByMe}</span>"   . ($type == 'openedBy'   && $mode == 'story' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'openedBy'   && $mode == 'story' ? ' btn-active-text' : '') . "'");
     echo html::a(inlink($app->rawMethod, "mode=story&type=reviewedBy"), "<span class='text'>{$lang->my->storyMenu->reviewedByMe}</span>" . ($type == 'reviewedBy' && $mode == 'story' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'reviewedBy' && $mode == 'story' ? ' btn-active-text' : '') . "'");
@@ -33,7 +33,7 @@
 <div id="mainContent">
   <?php if(!$stories):?>
   <div class="table-empty-tip">
-    <p><span class="text-muted"><?php echo $lang->story->noStory;?></span></p>
+    <p><span class="text-muted"><?php echo $mode == 'story' ? $lang->story->noStory : $lang->story->noRequirement;?></span></p>
   </div>
   <?php else:?>
   <form id='myStoryForm' class="main-table table-story" data-ride="table" method="post">