diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less
index fc3d127f73..67ad5b3afb 100644
--- a/awx/ui/client/legacy-styles/forms.less
+++ b/awx/ui/client/legacy-styles/forms.less
@@ -141,12 +141,19 @@
     padding-right: 50px;
 }
 
-.Form-textArea{
+.Form-textAreaLabel{
     width:100%;
 }
 
+.Form-textArea{
+    background-color: @field-secondary-bg!important;
+    background-color: @field-secondary-bg!important;
+    border-radius: 5px;
+    color: @field-input-text;
+}
+
 .Form-textInput{
-    height: 30px;
+    height: 30px!important;
     background-color: @field-secondary-bg!important;
     border-radius: 5px;
     border:1px solid @field-border;
diff --git a/awx/ui/client/src/forms/ActivityDetail.js b/awx/ui/client/src/forms/ActivityDetail.js
index 88a6dde4e5..7c879f778d 100644
--- a/awx/ui/client/src/forms/ActivityDetail.js
+++ b/awx/ui/client/src/forms/ActivityDetail.js
@@ -41,7 +41,7 @@ export default
                 changes: {
                     label: 'Changes',
                     type: 'textarea',
-                    class: 'Form-textArea',
+                    class: 'Form-textAreaLabel',
                     ngHide: "!changes || changes =='' || changes == 'null'",
                     readonly: true
                 }
diff --git a/awx/ui/client/src/forms/Credentials.js b/awx/ui/client/src/forms/Credentials.js
index 1673b84b6a..9921b3a27c 100644
--- a/awx/ui/client/src/forms/Credentials.js
+++ b/awx/ui/client/src/forms/Credentials.js
@@ -263,7 +263,7 @@ export default
                         variable: 'key_required',
                         init: true
                     },
-                    class: 'Form-textArea',
+                    class: 'Form-textAreaLabel',
                     hintText: "{{ key_hint }}",
                     addRequired: false,
                     editRequired: false,
diff --git a/awx/ui/client/src/forms/Groups.js b/awx/ui/client/src/forms/Groups.js
index de27d45d57..186ff5134f 100644
--- a/awx/ui/client/src/forms/Groups.js
+++ b/awx/ui/client/src/forms/Groups.js
@@ -39,7 +39,7 @@ export default
                 variables: {
                     label: 'Variables',
                     type: 'textarea',
-                    class: 'Form-textArea',
+                    class: 'Form-textAreaLabel',
                     addRequired: false,
                     editRequird: false,
                     rows: 12,
diff --git a/awx/ui/client/src/forms/JobTemplates.js b/awx/ui/client/src/forms/JobTemplates.js
index a0dd47356a..d8511147f8 100644
--- a/awx/ui/client/src/forms/JobTemplates.js
+++ b/awx/ui/client/src/forms/JobTemplates.js
@@ -173,7 +173,7 @@ export default
                 },
                 job_tags: {
                     label: 'Job Tags',
-                    type: 'text',
+                    type: 'textarea',
                     rows: 1,
                     addRequired: false,
                     editRequired: false,
@@ -192,7 +192,7 @@ export default
                 variables: {
                     label: 'Extra Variables',
                     type: 'textarea',
-                    class: 'Form-textArea',
+                    class: 'Form-textAreaLabel',
                     rows: 6,
                     addRequired: false,
                     editRequired: false,
diff --git a/awx/ui/client/src/forms/Source.js b/awx/ui/client/src/forms/Source.js
index 4b3f8838db..1eee07b344 100644
--- a/awx/ui/client/src/forms/Source.js
+++ b/awx/ui/client/src/forms/Source.js
@@ -126,7 +126,7 @@ export default
                     label: 'Environment Variables', //"{{vars_label}}" ,
                     ngShow: "source && source.value=='custom' ",
                     type: 'textarea',
-                    class: 'Form-textArea',
+                    class: 'Form-textAreaLabel',
                     addRequired: false,
                     editRequired: false,
                     rows: 6,
@@ -145,7 +145,7 @@ export default
                     label: 'Source Variables', //"{{vars_label}}" ,
                     ngShow: "source && (source.value == 'file' || source.value == 'ec2')",
                     type: 'textarea',
-                    class: 'Form-textArea',
+                    class: 'Form-textAreaLabel',
                     addRequired: false,
                     editRequird: false,
                     rows: 6,
@@ -172,7 +172,7 @@ export default
                                         "source.value == 'openstack')",
                     type: 'textarea',
                     addRequired: false,
-                    class: 'Form-textArea',
+                    class: 'Form-textAreaLabel',
                     editRequird: false,
                     rows: 6,
                     'default': '---',
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js
index 45d41c46ad..fc2f07e675 100644
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@@ -1043,9 +1043,9 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                         html += (field.rows) ? this.attr(field, 'rows') : "";
                         html += "ng-model=\"" + fld + '" ';
                         html += 'name="' + fld + '" ';
-                        html += "class=\"form-control";
+                        html += "class=\"form-control Form-textArea";
                         html += (field['class']) ? " " + field['class'] : "";
-                        html += (field['elementClass']) ? " " + field['elementClass'] : ""; 
+                        html += (field['elementClass']) ? " " + field['elementClass'] : "";
                         html += "\" ";
                         html += (field.ngChange) ? this.attr(field, 'ngChange') : "";
                         html += buildId(field, fld, this.form);