diff --git a/awx/ui/static/js/config.js b/awx/ui/static/js/config.js
index a4d5de1bad..a4d69296ee 100644
--- a/awx/ui/static/js/config.js
+++ b/awx/ui/static/js/config.js
@@ -10,7 +10,7 @@
 
 var $AnsibleConfig = 
 { 
-   session_timeout: 3600,             // cookie expiration in seconds. session will expire after this many
+   session_timeout: 10,             // cookie expiration in seconds. session will expire after this many
                                       // seconds of inactivity. 
                                       
    tooltip_delay: 2000,               // Default number of milliseconds to delay displaying/hiding tooltips    
diff --git a/awx/ui/static/js/controllers/Jobs.js b/awx/ui/static/js/controllers/Jobs.js
index 11e3a9edb1..8aa968f04d 100644
--- a/awx/ui/static/js/controllers/Jobs.js
+++ b/awx/ui/static/js/controllers/Jobs.js
@@ -292,10 +292,10 @@ function JobsEdit ($scope, $rootScope, $compile, $location, $log, $routeParams,
                }
            }
             
-           $('input[type="text"], textarea').attr('readonly','readonly');
-           $('select').prop('disabled', 'disabled');
-           $('.lookup-btn').prop('disabled', 'disabled');
-           $('.controls.buttons, hr').hide();
+           $('form[name="jobs_form"] input[type="text"], form[name="jobs_form"] jobs_form textarea').attr('readonly','readonly');
+           $('form[name="jobs_form"] select').prop('disabled', 'disabled');
+           $('form[name="jobs_form"] .lookup-btn').prop('disabled', 'disabled');
+           $('form[name="jobs_form"] .buttons, form[name="jobs_form"] hr').hide();
 
            scope.url = data.url; 
            var related = data.related;