diff --git a/awx/ui/client/lib/components/form/form.directive.js b/awx/ui/client/lib/components/form/form.directive.js
index d6eb3df9bb..018ca393e7 100644
--- a/awx/ui/client/lib/components/form/form.directive.js
+++ b/awx/ui/client/lib/components/form/form.directive.js
@@ -138,21 +138,21 @@ function AtFormController (eventService, strings) {
     vm.setValidationMessages = (errors, errorSet) => {
         let errorMessageSet = errorSet || false;
 
-        Object.keys(errors).forEach(error => {
-            if (!Array.isArray(error) && typeof error === 'object') {
-                errorMessageSet = vm.setValidationMessages(error, errorMessageSet);
+        Object.keys(errors).forEach(id => {
+            if (!Array.isArray(errors[id]) && typeof errors[id] === 'object') {
+                errorMessageSet = vm.setValidationMessages(errors[id], errorMessageSet);
 
                 return;
             }
 
             vm.components
                 .filter(component => component.category === 'input')
-                .filter(component => error[component.state.id])
+                .filter(component => errors[component.state.id])
                 .forEach(component => {
                     errorMessageSet = true;
 
                     component.state._rejected = true;
-                    component.state._message = error[component.state.id].join(' ');
+                    component.state._message = errors[component.state.id].join(' ');
                 });
         });
 
diff --git a/awx/ui/client/lib/components/modal/modal.directive.js b/awx/ui/client/lib/components/modal/modal.directive.js
index ae65e95975..f6e5510ce5 100644
--- a/awx/ui/client/lib/components/modal/modal.directive.js
+++ b/awx/ui/client/lib/components/modal/modal.directive.js
@@ -30,12 +30,10 @@ function AtModalController (eventService, strings) {
         vm.modal.hide = vm.hide;
     };
 
-    vm.show = (title, message, event) => {
+    vm.show = (title, message) => {
         vm.modal.title = title;
         vm.modal.message = message;
 
-        event.stopPropagation();
-
         listeners = eventService.addListeners([
             [window, 'click', vm.clickToHide]
         ]);
diff --git a/awx/ui/client/test/e2e/.babelrc b/awx/ui/client/test/e2e/.babelrc
new file mode 100644
index 0000000000..05758ba5a8
--- /dev/null
+++ b/awx/ui/client/test/e2e/.babelrc
@@ -0,0 +1,9 @@
+{
+  "presets": [
+    ["env", {
+      "targets": {
+        "node": 6
+      }
+    }]
+  ]
+}
diff --git a/awx/ui/client/test/e2e/runner.js b/awx/ui/client/test/e2e/runner.js
index e13cf9b17c..494d059abf 100755
--- a/awx/ui/client/test/e2e/runner.js
+++ b/awx/ui/client/test/e2e/runner.js
@@ -1,3 +1,3 @@
 #!/usr/bin/env node
-require('babel-register');
+require('babel-core/register');
 require('nightwatch/bin/runner.js');
diff --git a/awx/ui/package.json b/awx/ui/package.json
index 687b9d4ea0..f02cc3a352 100644
--- a/awx/ui/package.json
+++ b/awx/ui/package.json
@@ -79,8 +79,8 @@
     "less-plugin-autoprefix": "^1.4.2",
     "load-grunt-configs": "^1.0.0",
     "load-grunt-tasks": "^3.5.0",
-    "nightwatch": "^0.9.16",
     "ngtemplate-loader": "^2.0.1",
+    "nightwatch": "^0.9.16",
     "phantomjs-prebuilt": "^2.1.12",
     "script-loader": "^0.7.0",
     "style-loader": "^0.18.2",