diff --git a/extension/lite/task/ext/view/create.html.php b/extension/lite/task/ext/view/create.html.php
index 82727f8ed7..615b5dd014 100644
--- a/extension/lite/task/ext/view/create.html.php
+++ b/extension/lite/task/ext/view/create.html.php
@@ -18,6 +18,7 @@
 <?php js::set('vision', $this->config->vision);?>
 <?php js::set('projectID', $projectID);?>
 <?php js::set('productID', $productID);?>
+<?php js::set('teamMemberError', $lang->task->error->teamMember);?>
 <?php if(!empty($storyID)):?>
 <style> .title-group.required > .required:after {right: 110px;}</style>
 <?php endif;?>
diff --git a/module/task/js/create.js b/module/task/js/create.js
index 143cb904c8..a6d86ef482 100644
--- a/module/task/js/create.js
+++ b/module/task/js/create.js
@@ -546,10 +546,19 @@ $('#modalTeam .btn').click(function()
     if(teamList.length <= 2)
     {
         alert(teamMemberError);
+        return false;
     }
     else
     {
-        $('.close').click();
+        if(config.onlybody == 'yes')
+        {
+            $('.close').parent().click();
+        }
+        else
+        {
+            $('.close').click();
+        }
+
     }
 });