diff --git a/awx/ui/static/js/controllers/Jobs.js b/awx/ui/static/js/controllers/Jobs.js
index 259ec8e0a0..e652b3b886 100644
--- a/awx/ui/static/js/controllers/Jobs.js
+++ b/awx/ui/static/js/controllers/Jobs.js
@@ -255,7 +255,7 @@ function JobsEdit ($scope, $rootScope, $compile, $location, $log, $routeParams,
                     check_field: 'allow_callbacks',
                     default_val: dft
                 });
-                scope.callback_url = data.related.callback;
+                scope.callback_url = (data.related) ? data.related.callback : '<< Job template not found >>';
                 scope.$emit('jobTemplateLoadFinished');
             })
             .error( function() {
@@ -340,7 +340,7 @@ function JobsEdit ($scope, $rootScope, $compile, $location, $log, $routeParams,
             }
               
             scope.id = data.id;
-            scope.name = data.summary_fields.job_template.name;
+            scope.name = (data.summary_fields && data.summary_fields.job_template) ? data.summary_fields.job_template.name : '';
 
             if (fld === 'variables') {
                 // Parse extra_vars, converting to YAML.  
diff --git a/awx/ui/static/js/helpers/Hosts.js b/awx/ui/static/js/helpers/Hosts.js
index 4e60ca4698..9ac93f702d 100644
--- a/awx/ui/static/js/helpers/Hosts.js
+++ b/awx/ui/static/js/helpers/Hosts.js
@@ -99,7 +99,7 @@ angular.module('HostsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', 'H
                     for (j=0; j < jobs.length; j++) {
                         job = jobs[j];
                         html += "<tr>\n";
-                        html += "<td><a ng-click=\"showJobSummary(" + job.id + ")\">" + job.id + "</a></td>\n";
+                        html += "<td><a href=\"/#/jobs/" + job.id + "\">" + job.id + "</a></td>\n";
                         html += "<td class=\"text-center\"><a ng-click=\"showJobSummary(" + job.id + ")\"><i class=\"fa icon-job-" +
                             job.status + "\"></i></a></td>\n";
                         html += "<td><a href=\"/#/jobs/" + job.id + "/job_events/?host=" + encodeURI(host.name) + "\">Events</a> " +