diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index 29bae7991f..0be2c315f1 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -279,6 +279,7 @@ function loadProductExecutions(productID, projectID = 0)
         $(this).find('select').chosen();
         if(typeof(bugExecution) == 'string' && systemMode != 'classic') $('#executionIdBox').prepend("<span class='input-group-addon' id='executionBox' style='border-left-width: 0px;'>" + bugExecution + "</span>");
         if(required) $(this).addClass('required');
+        changeExecutionName(projectID);
     });
     loadProjectBuilds(projectID);
 }
diff --git a/module/bug/js/create.js b/module/bug/js/create.js
index 5de34d51f9..710b877545 100644
--- a/module/bug/js/create.js
+++ b/module/bug/js/create.js
@@ -157,18 +157,31 @@ $(function()
             return false;
         }
     });
+});
 
-    $('#project').change(function()
+/**
+ * Ajax change execution name.
+ *
+ * @param  int $projectID
+ * @access public
+ * @return void
+ */
+function changeExecutionName(projectID)
+{
+    if(parseInt(projectID))
     {
-        var projectID = parseInt($(this).val());
-        var link      = createLink('bug', 'ajaxGetExecutionLang', 'projectID=' + projectID);
-        projectID ? loadProjectTeamMembers(projectID) : loadExecutionTeamMembers($('#product').val());
+        loadProjectTeamMembers(projectID);
+        var link = createLink('bug', 'ajaxGetExecutionLang', 'projectID=' + projectID);
         $.post(link, function(executionLang)
         {
-            bugExecution = executionLang;
+            $('#executionBox').html(executionLang);
         })
-    });
-});
+    }
+    else
+    {
+        loadExecutionTeamMembers($('#product').val());
+    }
+}
 
 $(window).unload(function(){
     if(blockID) window.parent.refreshBlock($('#block' + blockID));
diff --git a/module/bug/js/edit.js b/module/bug/js/edit.js
index 1068899348..418c963d90 100644
--- a/module/bug/js/edit.js
+++ b/module/bug/js/edit.js
@@ -19,17 +19,26 @@ $(function()
             }
         });
     }
+});
 
-    $('#project').change(function()
+/**
+ * Ajax change execution name.
+ *
+ * @param  int projectID
+ * @access public
+ * @return void
+ */
+function changeExecutionName(projectID)
+{
+    if(parseInt(projectID))
     {
-        var projectID = $('#project').val();
-        var link      = createLink('bug', 'ajaxGetExecutionLang', 'projectID=' + projectID);
+        var link = createLink('bug', 'ajaxGetExecutionLang', 'projectID=' + projectID);
         $.post(link, function(executionLang)
         {
             $('#executionBox').html(executionLang);
         })
-    })
-});
+    }
+}
 
 /**
  * Set duplicate field.