diff --git a/awx/ui/client/src/forms/Groups.js b/awx/ui/client/src/forms/Groups.js
index d684c4e0e4..bf1050e922 100644
--- a/awx/ui/client/src/forms/Groups.js
+++ b/awx/ui/client/src/forms/Groups.js
@@ -305,6 +305,7 @@ export default
                     label: "Cache Timeout <span class=\"small-text\"> (seconds)</span>",
                     id: 'source-cache-timeout',
                     type: 'number',
+                    ngDisabled: '!(group_obj.summary_fields.user_capabilities.edit || canAdd)',
                     integer: true,
                     min: 0,
                     ngShow: "source && source.value !== '' && update_on_launch",
diff --git a/awx/ui/client/src/forms/JobTemplates.js b/awx/ui/client/src/forms/JobTemplates.js
index 761e5a3aca..fd4946f329 100644
--- a/awx/ui/client/src/forms/JobTemplates.js
+++ b/awx/ui/client/src/forms/JobTemplates.js
@@ -214,7 +214,7 @@ export default
                     dataTitle: i18n._('Forks'),
                     dataPlacement: 'right',
                     dataContainer: "body",
-                    ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)' // TODO: get working
+                    ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)'
                 },
                 limit: {
                     label: i18n._('Limit'),
diff --git a/awx/ui/client/src/lists/Templates.js b/awx/ui/client/src/lists/Templates.js
index a2dca9205d..d32d102dcc 100644
--- a/awx/ui/client/src/lists/Templates.js
+++ b/awx/ui/client/src/lists/Templates.js
@@ -114,7 +114,7 @@ export default
             },
             view: {
                 label: i18n._('View'),
-                ngClick: "editJobTemplate(template.id)",
+                ngClick: "editJobTemplate(template)",
                 awToolTip: i18n._('View template'),
                 "class": 'btn-default btn-xs',
                 dataPlacement: 'top',
diff --git a/awx/ui/client/src/notifications/notificationTemplates.form.js b/awx/ui/client/src/notifications/notificationTemplates.form.js
index 66e9a9854e..bb0d746fc7 100644
--- a/awx/ui/client/src/notifications/notificationTemplates.form.js
+++ b/awx/ui/client/src/notifications/notificationTemplates.form.js
@@ -397,6 +397,7 @@ export default ['i18n', function(i18n) {
                 subForm: 'typeSubForm',
                 ngShow: "notification_type.value == 'email'",
                 ngChange: "emailOptionsChange()",
+                ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)',
                 options: [{
                     value: 'use_tls',
                     label: i18n._('Use TLS'),
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js
index 28b2d97a3f..0abd46290b 100644
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@@ -1280,6 +1280,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                             html += "value=\"" + field.options[i].value + "\" ";
                             html += "ng-model=\"" + fld + "\" ";
                             html += (field.ngChange) ? this.attr(field, 'ngChange') : "";
+                            html += (field.ngDisabled) ? `ng-disabled="${field.ngDisabled}"` : "";
                             html += (field.readonly) ? "disabled " : "";
                             html += (field.required) ? "required " : "";
                             html += (field.ngshow) ? "ng-show=\"" + field.ngShow + "\" " : "";