diff --git a/module/job/js/create.ui.js b/module/job/js/create.ui.js
index a4ceb8818c..f579efddc2 100644
--- a/module/job/js/create.ui.js
+++ b/module/job/js/create.ui.js
@@ -2,7 +2,14 @@ function changeEngine(event)
 {
     const engine = $(event.target).val();
 
-    $('.reference').hide();
+    if(engine == 'jenkins')
+    {
+        $('.reference').removeClass('hidden');
+    }
+    else
+    {
+        $('.reference').addClass('hidden');
+    }
 
     var repos     = engine == 'gitlab' ? gitlabRepos : repoPairs;
     var repoItems = [];
@@ -170,13 +177,6 @@ function changeTriggerType(event)
     $('.custom-fields').addClass('hidden');
     if(type == 'commit')   $('.comment-fields').removeClass('hidden');
     if(type == 'schedule') $('.custom-fields').removeClass('hidden');
-    if(type == 'tag')
-    {
-        var repoID = $('#repo').val();
-        var type   = 'Git';
-        if(typeof(repoTypes[repoID]) != 'undefined') type = repoTypes[repoID];
-        if(type == 'Subversion') $('.svn-fields').removeClass('hidden');
-    }
 }
 
 function changeSonarqubeServer(event)
diff --git a/module/job/js/edit.ui.js b/module/job/js/edit.ui.js
index a8284a8f7a..21c4430322 100644
--- a/module/job/js/edit.ui.js
+++ b/module/job/js/edit.ui.js
@@ -1,6 +1,6 @@
 function changeEngine(engine)
 {
-    $('.reference').hide();
+    engine == 'jenkins' ? $('.reference').show() : $('.reference').hide();
 
     var repos     = engine == 'gitlab' ? gitlabRepos : repoPairs;
     var repoItems = [];
@@ -74,7 +74,10 @@ function changeRepo(event)
         {
             if(data.type.indexOf('git') != -1)
             {
-                $('.reference').removeClass('hidden');
+                var engine = $('[name=engine]').val();
+                if(engine == 'jenkins') $('.reference').removeClass('hidden');
+                $('.reference').addClass('gitRepo');
+
                 $('.svn-fields').addClass('hidden');
                 $('#reference option').remove();
 
@@ -88,6 +91,7 @@ function changeRepo(event)
             }
             else
             {
+                $('.reference').removeClass('gitRepo');
                 if($('#triggerType').val() == 'tag') $('.svn-fields').removeClass('hidden');
 
                 $('#svnDir').remove();
@@ -167,13 +171,6 @@ function changeTriggerType(event)
     $('.custom-fields').addClass('hidden');
     if(type == 'commit')   $('.comment-fields').removeClass('hidden');
     if(type == 'schedule') $('.custom-fields').removeClass('hidden');
-    if(type == 'tag')
-    {
-        var repoID = $('#repo').val();
-        var type   = 'Git';
-        if(typeof(repoTypes[repoID]) != 'undefined') type = repoTypes[repoID];
-        if(type == 'Subversion') $('.svn-fields').removeClass('hidden');
-    }
 }
 
 function changeSonarqubeServer(event)
diff --git a/module/job/ui/edit.html.php b/module/job/ui/edit.html.php
index 8aed1816a9..ab33b1c042 100644
--- a/module/job/ui/edit.html.php
+++ b/module/job/ui/edit.html.php
@@ -15,6 +15,8 @@ jsVar('repoPairs', $repoPairs);
 jsVar('gitlabRepos', $gitlabRepos);
 jsVar('engine', $job->engine);
 jsVar('job', $job);
+jsVar('dirChange', $lang->job->dirChange);
+jsVar('buildTag', $lang->job->buildTag);
 
 if($job->customParam)
 {
@@ -133,9 +135,9 @@ formPanel
         ),
         formGroup
         (
-            setClass('reference hidden'),
+            $job->engine == 'jenkins' ? setClass('reference') : setClass('reference hidden'),
             set::labelWidth('5em'),
-            set::label($lang->job->repo),
+            set::label($lang->job->branch),
             set::required(true),
             set::name('reference'),
             set::items($refList),