diff --git a/awx/ui/static/js/helpers/JobSubmission.js b/awx/ui/static/js/helpers/JobSubmission.js
index f402e64ca2..20931a4e26 100644
--- a/awx/ui/static/js/helpers/JobSubmission.js
+++ b/awx/ui/static/js/helpers/JobSubmission.js
@@ -150,7 +150,7 @@ function($location, Wait, GetBasePath, LookUpInit, JobTemplateForm, CredentialLi
         // html+='<br>job_launch_form.$valid = {{job_launch_form.$valid}}<br>';
         html+='</form>';
         $('#password-modal').empty().html(html);
-        $('#password-modal').find('textarea').before(scope.helpContainer);
+        $('#password-modal').find('#job_extra_vars').before(scope.helpContainer);
         e = angular.element(document.getElementById('password-modal'));
         $compile(e)(scope);
 
diff --git a/awx/ui/static/js/helpers/Survey.js b/awx/ui/static/js/helpers/Survey.js
index 334e5d624d..43bed88548 100644
--- a/awx/ui/static/js/helpers/Survey.js
+++ b/awx/ui/static/js/helpers/Survey.js
@@ -633,16 +633,17 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
             };
 
             scope.typeChange = function() {
-                // alert('typechange');
-                scope.default = null;
-                scope.default_multiselect = null;
-                scope.default_float = null;
-                scope.default_int = null;
-                scope.default_textarea = null;
-                scope.int_min = null;
-                scope.int_max = null;
-                scope.float_min = null;
-                scope.float_max = null;
+                scope.default = "";
+                scope.default_multiselect = "";
+                scope.default_float = "";
+                scope.default_int = "";
+                scope.default_textarea = "";
+                scope.survey_question_form.choices.$setPristine();
+                scope.choices = "";
+                scope.int_min = "";
+                scope.int_max = "";
+                scope.float_min = "";
+                scope.float_max = "";
             };
 
             scope.submitQuestion = function(){