diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-link-form.partial.html b/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-link-form.partial.html
index bcbdf10937..590ca7cee7 100644
--- a/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-link-form.partial.html
+++ b/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-link-form.partial.html
@@ -1,4 +1,6 @@
-<div class="WorkflowMaker-formTitle">{{readOnly ? strings.get('workflow_maker.VIEW_LINK') : (linkConfig.mode === 'add' ? strings.get('workflow_maker.ADD_LINK') : strings.get('workflow_maker.EDIT_LINK')) }} | {{linkConfig.source.name}} {{linkConfig.target ? 'to ' + linkConfig.target.name : ''}}</div>
+<div class="WorkflowMaker-formTitle">
+    {{readOnly ? strings.get('workflow_maker.VIEW_LINK') : (linkConfig.mode === 'add' ? strings.get('workflow_maker.ADD_LINK') : strings.get('workflow_maker.EDIT_LINK')) }} | {{linkConfig.source.name}} {{linkConfig.target ? '&rarr; ' + linkConfig.target.name : ''}}
+</div>
 <div class="WorkflowMaker-form">
     <div class="form-group Form-formGroup Form-formGroup--singleColumn">
         <div ng-show="linkConfig.mode === 'add' && !linkConfig.target">{{:: strings.get('workflow_maker.NEW_LINK')}}</div>
diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.partial.html b/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.partial.html
index beadf08571..7e9c23bc64 100644
--- a/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.partial.html
+++ b/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.partial.html
@@ -15,7 +15,7 @@
             <div class="row" ng-show="wf_maker_templates.length === 0 && !(searchTags | isEmpty)">
                 <div class="col-lg-12 List-searchNoResults" translate>No records matched your search.</div>
             </div>
-            <div class="List-noItems" ng-show="wf_maker_templates.length === 0 && (searchTags | isEmpty)">PLEASE ADD ITEMS TO THIS LIST</div>
+            <div class="List-noItems" ng-show="wf_maker_templates.length === 0 && (searchTags | isEmpty)" translate>PLEASE ADD ITEMS TO THIS LIST</div>
             <div class="list-table-container" ng-show="wf_maker_templates.length > 0">
                 <div id="templates_table" class="List-table" is-extended="false">
                     <div class="List-lookupLayout List-tableHeaderRow">
diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
index 2ffc6fc18a..0bbf178be3 100644
--- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
+++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
@@ -404,7 +404,10 @@ export default ['$scope', 'TemplatesService',
             $scope.graphState.nodeBeingAdded = workflowMakerNodeIdCounter;
 
             $scope.graphState.arrayOfLinksForChart.push({
-                source: {id: parent.id},
+                source: {
+                    id: parent.id,
+                    unifiedJobTemplate: parent.unifiedJobTemplate
+                },
                 target: {id: workflowMakerNodeIdCounter},
                 edgeType: "placeholder"
             });
@@ -439,7 +442,10 @@ export default ['$scope', 'TemplatesService',
             $scope.graphState.nodeBeingAdded = workflowMakerNodeIdCounter;
 
             $scope.graphState.arrayOfLinksForChart.push({
-                source: {id: link.source.id},
+                source: {
+                    id: link.source.id,
+                    unifiedJobTemplate: link.source.unifiedJobTemplate
+                },
                 target: {id: workflowMakerNodeIdCounter},
                 edgeType: "placeholder"
             });
@@ -480,6 +486,7 @@ export default ['$scope', 'TemplatesService',
                     $scope.graphState.arrayOfLinksForChart.map( (link) => {
                         if (link.target.id === nodeId) {
                             link.edgeType = edgeType.value;
+                            link.target.unifiedJobTemplate = selectedTemplate;
                         }
                     });
                 }
@@ -489,6 +496,15 @@ export default ['$scope', 'TemplatesService',
                     nodeRef[$scope.nodeConfig.nodeId].promptData = _.cloneDeep(promptData);
                     nodeRef[$scope.nodeConfig.nodeId].isEdited = true;
                     $scope.graphState.nodeBeingEdited = null;
+
+                    $scope.graphState.arrayOfLinksForChart.map( (link) => {
+                        if (link.target.id === nodeId) {
+                            link.target.unifiedJobTemplate = selectedTemplate;
+                        }
+                        if (link.source.id === nodeId) {
+                            link.source.unifiedJobTemplate = selectedTemplate;
+                        }
+                    });
                 }
             }