diff --git a/app/assets/javascripts/controllers/catalog/catalog_item_form_controller.js b/app/assets/javascripts/controllers/catalog/catalog_item_form_controller.js
index 59b15f9516e7..42f90876d541 100644
--- a/app/assets/javascripts/controllers/catalog/catalog_item_form_controller.js
+++ b/app/assets/javascripts/controllers/catalog/catalog_item_form_controller.js
@@ -1,6 +1,7 @@
 ManageIQ.angular.app.controller('catalogItemFormController', ['$scope', 'catalogItemFormId', 'miqService', 'postService', 'API', 'catalogItemDataFactory', function($scope, catalogItemFormId, miqService, postService, API, catalogItemDataFactory) {
+  var vm = this;
   var init = function() {
-    $scope.catalogItemModel = {
+    vm.catalogItemModel = {
       name: '',
       description: '',
       display: false,
@@ -35,38 +36,38 @@ ManageIQ.angular.app.controller('catalogItemFormController', ['$scope', 'catalog
       retirement_variables: {"r_var1": "r_val1", "r_var2": "r_val2"},
       retirement_editMode: false
     };
-    $scope.formId = catalogItemFormId;
-    $scope.afterGet = false;
-    $scope.modelCopy = angular.copy( $scope.catalogItemModel );
-    $scope.model = "catalogItemModel";
+    vm.formId = catalogItemFormId;
+    vm.afterGet = false;
+    vm.modelCopy = angular.copy( vm.catalogItemModel );
+    vm.model = "catalogItemModel";
 
     ManageIQ.angular.scope = $scope;
 
     if (catalogItemFormId == 'new') {
-      $scope.newRecord                    = true;
-      $scope.catalogItemModel.name        = '';
-      $scope.catalogItemModel.description = '';
-      $scope.catalogItemModel.catalog_id  = '';
-      $scope.catalogItemModel.display     = false;
-      $scope.catalogItemModel.provisioning_dialog_id  = '';
-      $scope.catalogItemModel.retirement_dialog_id  = '';
-      $scope.catalogItemModel.prov_type   = 'generic_ansible_playbook';
-      $scope.formOptions();
-      $scope.afterGet  = true;
-      $scope.modelCopy = angular.copy( $scope.catalogItemModel );
+      vm.newRecord                    = true;
+      vm.catalogItemModel.name        = '';
+      vm.catalogItemModel.description = '';
+      vm.catalogItemModel.catalog_id  = '';
+      vm.catalogItemModel.display     = false;
+      vm.catalogItemModel.provisioning_dialog_id  = '';
+      vm.catalogItemModel.retirement_dialog_id  = '';
+      vm.catalogItemModel.prov_type   = 'generic_ansible_playbook';
+      vm.formOptions();
+      vm.afterGet  = true;
+      vm.modelCopy = angular.copy( vm.catalogItemModel );
     } else {
-      $scope.newRecord = false;
+      vm.newRecord = false;
       catalogItemDataFactory.getCatalogItemData(catalogItemFormId).then(function (catalogItemData) {
-        $scope.newRecord = false;
-        $scope.catalogItemModel.name = catalogItemData.name;
-        $scope.catalogItemModel.description = catalogItemData.description;
-        $scope.catalogItemModel.display = catalogItemData.display;
-        $scope.catalogItemModel.catalog_id = catalogItemData.service_template_catalog_id;
-        $scope.catalogItemModel.provisioning_dialog_id  = catalogItemData.provisioning_dialog_id;;
-        $scope.catalogItemModel.retirement_dialog_id  = catalogItemData.retirement_dialog_id;;
-        $scope.formOptions();
-        $scope.afterGet = true;
-        $scope.modelCopy = angular.copy($scope.catalogItemModel);
+        vm.newRecord = false;
+        vm.catalogItemModel.name = catalogItemData.name;
+        vm.catalogItemModel.description = catalogItemData.description;
+        vm.catalogItemModel.display = catalogItemData.display;
+        vm.catalogItemModel.catalog_id = catalogItemData.service_template_catalog_id;
+        vm.catalogItemModel.provisioning_dialog_id  = catalogItemData.provisioning_dialog_id;;
+        vm.catalogItemModel.retirement_dialog_id  = catalogItemData.retirement_dialog_id;;
+        vm.formOptions();
+        vm.afterGet = true;
+        vm.modelCopy = angular.copy(vm.catalogItemModel);
       });
     }
   };
@@ -103,132 +104,153 @@ ManageIQ.angular.app.controller('catalogItemFormController', ['$scope', 'catalog
   };
 
   // list of service catalogs
-  $scope.formOptions = function() {
+  vm.formOptions = function() {
     API.get("/api/service_catalogs/?expand=resources&attributes=id,name").then(function(data) {
-      $scope.catalogs = data.resources;
-      $scope._catalog = _.find($scope.catalogs, {id: $scope.catalogItemModel.catalog_id})
+      vm.catalogs = data.resources;
+      vm._catalog = _.find(vm.catalogs, {id: vm.catalogItemModel.catalog_id})
     })
 
     // list of service dailaogs
     API.get("/api/service_dialogs/?expand=resources&attributes=id,label").then(function (data) {
-      $scope.dialogs = data.resources
-      $scope._retirement_dialog = _.find($scope.dialogs, {id: $scope.catalogItemModel.retirement_dialog_id})
-      $scope._provisioning_dialog = _.find($scope.dialogs, {id: $scope.catalogItemModel.provisioning_dialog_id})
+      vm.dialogs = data.resources
+      vm._retirement_dialog = _.find(vm.dialogs, {id: vm.catalogItemModel.retirement_dialog_id})
+      vm._provisioning_dialog = _.find(vm.dialogs, {id: vm.catalogItemModel.provisioning_dialog_id})
     })
 
     // list of repositories
     API.get("/api/configuration_script_sources/?expand=resources&attributes=id,name").then(function (data) {
-      $scope.repositories = data.resources;
-      $scope._retirement_repository = _.find($scope.repositories, {id: $scope.catalogItemModel.retirement_repository_id})
-      $scope._provisioning_repository = _.find($scope.repositories, {id: $scope.catalogItemModel.provisioning_repository_id})
+      vm.repositories = data.resources;
+      vm._retirement_repository = _.find(vm.repositories, {id: vm.catalogItemModel.retirement_repository_id})
+      vm._provisioning_repository = _.find(vm.repositories, {id: vm.catalogItemModel.provisioning_repository_id})
     })
 
     // list of machine credentials
     // check if the type of credentials can be specified in the API
     //API.get("/api/automation_manager_authentications/?expand=resources&attributes=id,name")
     API.get("/api/service_catalogs/?expand=resources&attributes=id,name").then(function (data) {
-      $scope.machine_credentials = data.resources;
-      $scope._retirement_machine_credential = _.find($scope.machine_credentials, {id: $scope.catalogItemModel.retirement_machine_credential_id})
-      $scope._provisioning_machine_credential = _.find($scope.machine_credentials, {id: $scope.catalogItemModel.provisioning_machine_credential_id})
+      vm.machine_credentials = data.resources;
+      vm._retirement_machine_credential = _.find(vm.machine_credentials, {id: vm.catalogItemModel.retirement_machine_credential_id})
+      vm._provisioning_machine_credential = _.find(vm.machine_credentials, {id: vm.catalogItemModel.provisioning_machine_credential_id})
     })
 
     // list of network credentials
     // check if the type of credentials can be specified in the API
     //API.get("/api/automation_manager_authentications/?expand=resources&attributes=id,name")
      API.get("/api/service_catalogs/?expand=resources&attributes=id,name").then(function (data) {
-      $scope.network_credentials = data.resources;
-      $scope._retirement_network_credential = _.find($scope.network_credentials, {id: $scope.catalogItemModel.retirement_network_credential_id})
-      $scope._provisioning_network_credential = _.find($scope.network_credentials, {id: $scope.catalogItemModel.provisioning_network_credential_id})
+      vm.network_credentials = data.resources;
+      vm._retirement_network_credential = _.find(vm.network_credentials, {id: vm.catalogItemModel.retirement_network_credential_id})
+      vm._provisioning_network_credential = _.find(vm.network_credentials, {id: vm.catalogItemModel.provisioning_network_credential_id})
     })
 
     // list of cloud credentials
     // check if the type of credentials can be specified in the API
     //API.get("/api/automation_manager_authentications/?expand=resources&attributes=id,name")
     API.get("/api/service_catalogs/?expand=resources&attributes=id,name").then(function (data) {
-      $scope.cloud_credentials = data.resources;
-      $scope._retirement_cloud_credential = _.find($scope.cloud_credentials, {id: $scope.catalogItemModel.retirement_cloud_credential_id})
-      $scope._provisioning_cloud_credential = _.find($scope.cloud_credentials, {id: $scope.catalogItemModel.provisioning_cloud_credential_id})
+      vm.cloud_credentials = data.resources;
+      vm._retirement_cloud_credential = _.find(vm.cloud_credentials, {id: vm.catalogItemModel.retirement_cloud_credential_id})
+      vm._provisioning_cloud_credential = _.find(vm.cloud_credentials, {id: vm.catalogItemModel.provisioning_cloud_credential_id})
     })
   };
 
   // get playbooks for selected repository
-  $scope.repositoryChanged = function(prefix, id) {
+  vm.repositoryChanged = function(prefix, id) {
     API.get("/api/configuration_script_sources/" + id + "?attributes=configuration_script_payloads").then(function(data){
-      $scope.catalogItemModel[prefix + '_playbook_id'] = '';
-      $scope.catalogItemModel[prefix + '_repository_id'] = id;
-      $scope[prefix + '_playbooks']  = data.configuration_script_payloads;
+      vm.catalogItemModel[prefix + '_playbook_id'] = '';
+      vm.catalogItemModel[prefix + '_repository_id'] = id;
+      vm[prefix + '_playbooks']  = data.configuration_script_payloads;
     })
   };
 
-  $scope.$watch('_provisioning_repository', function(value) {
+  $scope.$watch('vm._provisioning_repository', function(value) {
     if (value) {
-      $scope.repositoryChanged("provisioning", value.id)
+      vm.repositoryChanged("provisioning", value.id)
     } else
-      $scope.catalogItemModel['provisioning_repository_id'] = ''
+      vm.catalogItemModel['provisioning_repository_id'] = ''
   });
 
-  $scope.$watch('_retirement_repository', function(value) {
+  $scope.$watch('vm._retirement_repository', function(value) {
     if (value) {
-      $scope.repositoryChanged("retirement", value.id)
+      vm.repositoryChanged("retirement", value.id)
     } else
-      $scope.catalogItemModel['retirement_repository_id'] = ''
+      vm.catalogItemModel['retirement_repository_id'] = ''
   });
 
-  $scope.$watch('catalogItemModel.display', function(value) {
-    $scope.catalogItemModel.display = value;
-    return $scope.catalogItemModel.display;
+  $scope.$watch('vm.catalogItemModel.display', function(value) {
+    vm.catalogItemModel.display = value;
+    return vm.catalogItemModel.display;
   })
 
-  $scope.addKeyValue = function(prefix) {
-    $scope.catalogItemModel[prefix + "_variables"][$scope.catalogItemModel[prefix + "_key"]] =  $scope.catalogItemModel[prefix + "_value"]
-    $scope.catalogItemModel[prefix + "_key"] = '';
-    $scope.catalogItemModel[prefix + "_value"] = '';
+  vm.addKeyValue = function(prefix) {
+    vm.catalogItemModel[prefix + "_variables"][vm.catalogItemModel[prefix + "_key"]] =  vm.catalogItemModel[prefix + "_value"]
+    vm.catalogItemModel[prefix + "_key"] = '';
+    vm.catalogItemModel[prefix + "_value"] = '';
   }
 
-  $scope.provisioning_repository_selected = function() {
-    return $scope.catalogItemModel.provisioning_repository_id !== '';
+  vm.provisioning_repository_selected = function() {
+    return vm.catalogItemModel.provisioning_repository_id !== '';
   }
 
-  $scope.retirement_repository_selected = function() {
-    return $scope.catalogItemModel.retirement_repository_id !== '';
+  vm.retirement_repository_selected = function() {
+    return vm.catalogItemModel.retirement_repository_id !== '';
   }
 
-  $scope.removeKeyValue = function(prefix, key) {
-    delete $scope.catalogItemModel[prefix + "_variables"][key];
+  vm.removeKeyValue = function(prefix, key) {
+    delete vm.catalogItemModel[prefix + "_variables"][key];
   }
 
-  $scope.editKeyValue = function(prefix, key, key_value, index) {
-    $scope.catalogItemModel[prefix + "_editMode"] = true;
-    $scope.catalogItemModel.s_index = index;
-    $scope.catalogItemModel.key = key;
-    $scope.catalogItemModel.key_value = key_value;
-    $scope.catalogItemModel.original_key = key;
-    $scope.catalogItemModel.original_key_value = key_value;
+  vm.editKeyValue = function(prefix, key, key_value, index) {
+    vm.catalogItemModel[prefix + "_editMode"] = true;
+    vm.catalogItemModel.s_index = index;
+    vm.catalogItemModel.key = key;
+    vm.catalogItemModel.key_value = key_value;
+    vm.catalogItemModel.original_key = key;
+    vm.catalogItemModel.original_key_value = key_value;
   }
 
-  $scope.cancelKeyValue = function(prefix, key, key_value, index) {
-    $scope.catalogItemModel[prefix + "_editMode"] = false;
-    $scope.catalogItemModel.s_index = '';
-    $scope.catalogItemModel[prefix + "_variables"][$scope.catalogItemModel.original_key] = $scope.catalogItemModel.original_key_value;
+  vm.cancelKeyValue = function(prefix, key, key_value, index) {
+    vm.catalogItemModel[prefix + "_editMode"] = false;
+    vm.catalogItemModel.s_index = '';
+    vm.catalogItemModel[prefix + "_variables"][vm.catalogItemModel.original_key] = vm.catalogItemModel.original_key_value;
   }
 
-  $scope.saveKeyValue = function(prefix, index) {
-    $scope.catalogItemModel[prefix + "_editMode"] = false;
-    $scope.catalogItemModel.s_index = '';
+  vm.saveKeyValue = function(prefix, index) {
+    vm.catalogItemModel[prefix + "_editMode"] = false;
+    vm.catalogItemModel.s_index = '';
     // delete key if key name was edited, and a add new key to hash with new name
-    if ($scope.catalogItemModel.original_key !== $scope.catalogItemModel.key)
-      delete $scope.catalogItemModel[prefix + "_variables"][$scope.catalogItemModel.original_key];
+    if (vm.catalogItemModel.original_key !== vm.catalogItemModel.key)
+      delete vm.catalogItemModel[prefix + "_variables"][vm.catalogItemModel.original_key];
 
-    $scope.catalogItemModel[prefix + "_variables"][$scope.catalogItemModel.key] = $scope.catalogItemModel.key_value;
+    vm.catalogItemModel[prefix + "_variables"][vm.catalogItemModel.key] = vm.catalogItemModel.key_value;
   }
 
-  $scope.toggleDialogSelection = function(prefix, selected_value) {
-    $scope.catalogItemModel[prefix + "_dialog_existing"] = selected_value
+  vm.toggleDialogSelection = function(prefix, selected_value) {
+    vm.catalogItemModel[prefix + "_dialog_existing"] = selected_value
   };
 
-  $scope.fieldsRequired = function(prefix) {
+  vm.fieldsRequired = function(prefix) {
     return prefix == "provisioning";
   };
 
+  $scope.cancelClicked = function() {
+    catalogItemEditButtonClicked('cancel');
+    $scope.angularForm.$setPristine(true);
+  };
+
+  $scope.resetClicked = function() {
+    vm.catalogItemModel = angular.copy( vm.modelCopy );
+    $scope.angularForm.$setUntouched(true);
+    $scope.angularForm.$setPristine(true);
+    miqService.miqFlash("warn", __("All changes have been reset"));
+  };
+
+  $scope.saveClicked = function() {
+    catalogItemEditButtonClicked('save', true);
+    $scope.angularForm.$setPristine(true);
+  };
+
+  $scope.addClicked = function() {
+    $scope.saveClicked();
+  };
+
   init();
 }]);
diff --git a/app/views/catalog/_st_angular_form.html.haml b/app/views/catalog/_st_angular_form.html.haml
index b4cb9ddce64d..a903a18988dc 100644
--- a/app/views/catalog/_st_angular_form.html.haml
+++ b/app/views/catalog/_st_angular_form.html.haml
@@ -1,8 +1,10 @@
 - @angular_form = true
 
 %form.form-horizontal#form_div{"name"          => "angularForm",
-               "ng-controller" => "catalogItemFormController",
-               "ng-show"       => "afterGet"}
+               "ng-controller" => "catalogItemFormController as vm",
+               "miq-form"      => 'true',
+               "ng-show"       => "vm.afterGet",
+               "model-copy"    => 'vm.modelCopy'}
   = render :partial => "layouts/flash_msg"
   %div
     %div
@@ -13,7 +15,7 @@
           %input.form-control{"type"           => "text",
                               "id"             => "name",
                               "name"           => "name",
-                              "ng-model"       => "catalogItemModel.name",
+                              "ng-model"       => "vm.catalogItemModel.name",
                               "maxlength"      => "#{MAX_NAME_LEN}",
                               "miqrequired"    => "",
                               "checkchange"    => "",
@@ -27,7 +29,7 @@
           %input.form-control{"type"        => "text",
                               "id"          => "description",
                               "name"        => "description",
-                              "ng-model"    => "catalogItemModel.description",
+                              "ng-model"    => "vm.catalogItemModel.description",
                               "maxlength"   => "#{MAX_DESC_LEN}",
                               "miqrequired" => "",
                               "checkchange" => ""}
@@ -40,18 +42,18 @@
           %input#use_config{"bs-switch"       => "",
                             "type"            => "checkbox",
                             "name"            => "display",
-                            "ng-model"        => "catalogItemModel.display",
+                            "ng-model"        => "vm.catalogItemModel.display",
                             "switch-on-text"  => "Yes",
                             "switch-off-text" => "No",
                             "checkchange" => ""}
 
-    .form-group{"ng-class" => "{'has-error': catalogItemModel.display}"}
+    .form-group{"ng-class" => "{'has-error': vm.catalogItemModel.display}"}
       %label.col-md-2.control-label{"for" => "catalog_id"}
         = _('Catalog')
       .col-md-8
-        %select{"ng-model"    => "_catalog",
+        %select{"ng-model"    => "vm._catalog",
                 "name"        => "catalog_id",
-                "ng-required" => "catalogItemModel.display",
+                "ng-required" => "vm.catalogItemModel.display",
                 'ng-options'  => 'catalog as catalog.name for catalog in catalogs',
                 'pf-select'   => true}
           %option{"value" => ""}
@@ -60,7 +62,7 @@
           = _("Required")
 
   = render :partial => "layouts/angular/multi_tab_ansible_form_options",
-           :locals  => {:record => @record, :ng_model => "catalogItemModel"}
+           :locals  => {:record => @record, :ng_model => "vm.catalogItemModel"}
   = render :partial => "layouts/angular/x_edit_buttons_angular"
 
 :javascript
diff --git a/app/views/layouts/angular/_ansible_form_options_angular.html.haml b/app/views/layouts/angular/_ansible_form_options_angular.html.haml
index e74617971cb2..f973d2177973 100644
--- a/app/views/layouts/angular/_ansible_form_options_angular.html.haml
+++ b/app/views/layouts/angular/_ansible_form_options_angular.html.haml
@@ -2,26 +2,26 @@
 .row
   .col-md-12.col-lg-6
     .form-group{"ng-class" => "{'has-error': angularForm.#{prefix}_repository_id.$invalid}"}
-      %label.col-md-2.control-label{"for" => "#{prefix}_repository_id"}
+      %label.col-md-2.control-label{"for" => "vm.#{prefix}_repository_id"}
         = _('Repository')
       .col-md-8
-        %select{"ng-model"    => "_#{prefix}_repository",
+        %select{"ng-model"    => "vm._#{prefix}_repository",
                 "name"        => "#{prefix}_repository_id",
-                'ng-options'  => 'repository as repository.name for repository in repositories',
-                "ng-required" => "fieldsRequired('#{prefix}')",
-                'ng_change'   => "repository_changed()",
+                'ng-options'  => 'repository as repository.name for repository in vm.repositories',
+                "ng-required" => "vm.fieldsRequired('#{prefix}')",
+                'ng_change'   => "vm.repository_changed()",
                 'pf-select'   => true}
           %option{"value" => ""}
             = "<#{_('Choose')}>"
 
-    #playbook_div{"ng-if" => "#{prefix}_repository_selected()"}
+    #playbook_div{"ng-if" => "vm.#{prefix}_repository_selected()"}
       .form-group{"ng-class" => "{'has-error': angularForm.#{prefix}_playbook_id.$invalid}"}
-        %label.col-md-2.control-label{"for" => "#{prefix}_playbook_id"}
+        %label.col-md-2.control-label{"for" => "vm.#{prefix}_playbook_id"}
           = _('Playbook')
         .col-md-8
-          %select{"ng-model"    => "_#{prefix}_playbook",
+          %select{"ng-model"    => "vm._#{prefix}_playbook",
                   "name"        => "#{prefix}_playbook_id",
-                  'ng-options'  => "playbook as playbook.name for playbook in #{prefix}_playbooks",
+                  'ng-options'  => "playbook as playbook.name for playbook in vm.#{prefix}_playbooks",
                   "required"    => "",
                   :miqrequired  => true,
                   :checkchange  => true,
@@ -29,14 +29,14 @@
             %option{"value" => ""}
               = "<#{_('Choose')}>"
 
-      #credentials_div{"ng-show" => "#{prefix}_repository_selected()"}
+      #credentials_div{"ng-show" => "vm.#{prefix}_repository_selected()"}
         .form-group{"ng-class" => "{'has-error': angularForm.#{prefix}_machine_credential_id.$invalid}"}
           %label.col-md-2.control-label{"for" => "#{prefix}_machine_credential_id"}
             = _('Machine Credentials')
           .col-md-8
-            %select{"ng-model"    => "_#{prefix}_machine_credential",
+            %select{"ng-model"    => "vm._#{prefix}_machine_credential",
                     "name"        => "#{prefix}_machine_credential_id",
-                    'ng-options'  => 'machine_credential as machine_credential.name for machine_credential in machine_credentials',
+                    'ng-options'  => 'machine_credential as machine_credential.name for machine_credential in vm.machine_credentials',
                     "required"    => "",
                     :miqrequired  => true,
                     :checkchange  => true,
@@ -45,24 +45,24 @@
                 = "<#{_('Choose')}>"
 
         .form-group
-          %label.col-md-2.control-label{"for" => "#{prefix}_network_credential_id"}
+          %label.col-md-2.control-label{"for" => "vm.#{prefix}_network_credential_id"}
             = _('Network Credentials')
           .col-md-8
-            %select{"ng-model"    => "_#{prefix}_network_credential",
+            %select{"ng-model"    => "vm._#{prefix}_network_credential",
                     "name"        => "#{prefix}_network_credential_id",
-                    'ng-options'  => 'network_credential as network_credential.name for network_credential in network_credentials',
+                    'ng-options'  => 'network_credential as network_credential.name for network_credential in vm.network_credentials',
                     :checkchange  => true,
                     'pf-select'   => true}
               %option{"value" => ""}
                 = "<#{_('Choose')}>"
 
         .form-group
-          %label.col-md-2.control-label{"for" => "#{prefix}_cloud_credential_id"}
+          %label.col-md-2.control-label{"for" => "vm.#{prefix}_cloud_credential_id"}
             = _('Cloud Credentials')
           .col-md-8
-            %select{"ng-model"    => "_#{prefix}_cloud_credential",
+            %select{"ng-model"    => "vm._#{prefix}_cloud_credential",
                     "name"        => "#{prefix}_cloud_credential_id",
-                    'ng-options'  => 'cloud_credential as cloud_credential.name for cloud_credential in cloud_credentials',
+                    'ng-options'  => 'cloud_credential as cloud_credential.name for cloud_credential in vm.cloud_credentials',
                     :checkchange  => true,
                     'pf-select'   => true}
               %option{"value" => ""}
@@ -73,7 +73,7 @@
         = _("Inventory")
       .col-md-8
         %input.form-control{:type         => "text",
-                            'ng-model'    => "#{ng_model}.#{prefix}_inventory",
+                            'ng-model'    => "vm.#{ng_model}.#{prefix}_inventory",
                             :name         => "#{prefix}_inventory",
                             :maxlength    => 50,
                             "miqrequired" => "",
@@ -153,14 +153,14 @@
         {{#{ng_model}.#{prefix}_dialog_existing}}
       .col-md-4
         %label.radio
-          %input{"ng-model" => "#{prefix}_dialog_existing", :type => "radio", :value => "existing", "ng-click" => "toggleDialogSelection('#{prefix}', 'existing')", "ng-checked" => "#{ng_model}.#{prefix}_dialog_existing == 'existing'"}
+          %input{"ng-model" => "vm.#{prefix}_dialog_existing", :type => "radio", :value => "existing", "ng-click" => "vm.toggleDialogSelection('#{prefix}', 'existing')", "ng-checked" => "#{ng_model}.#{prefix}_dialog_existing == 'existing'"}
           = _("Use Existing")
         %label.radio
-          %input{"ng-model" => "#{prefix}_dialog_existing", :type => "radio", :value => "create", "ng-click" => "toggleDialogSelection('#{prefix}', 'create')", "ng-checked" => ("#{ng_model}.#{prefix}_dialog_existing == 'create'")}
+          %input{"ng-model" => "vm.#{prefix}_dialog_existing", :type => "radio", :value => "create", "ng-click" => "vm.toggleDialogSelection('#{prefix}', 'create')", "ng-checked" => ("#{ng_model}.#{prefix}_dialog_existing == 'create'")}
           = _("Create New")
       .col-md-4
         .form-group{"ng-class" => "{'has-error': angularForm.#{prefix}_dialog_id.$invalid}", "ng-if" => "#{ng_model}.#{prefix}_dialog_existing == 'existing'"}
-          %select{"ng-model"    => "_#{prefix}_dialog",
+          %select{"ng-model"    => "vm._#{prefix}_dialog",
                   "name"        => "#{prefix}_dialog_id",
                   'ng-options'  => 'dialog as dialog.label for dialog in dialogs',
                   "ng-required" => "fieldsRequired('#{prefix}') && #{ng_model}.#{prefix}_dialog_existing == 'existing'",
@@ -174,7 +174,7 @@
         .form-group{"ng-class" => "{'has-error': angularForm.#{prefix}_dialog_name.$invalid}", "ng-if" => "#{ng_model}.#{prefix}_dialog_existing == 'create'"}
           %input.form-control{:type         => "text",
                               'ng-model'    => "#{ng_model}.#{prefix}_dialog_name",
-                              :name         => "#{prefix}_dialog_name",
+                              :name         => "vm.#{prefix}_dialog_name",
                               :maxlength    => 50,
                               "ng-required" => "fieldsRequired('#{prefix}') && #{ng_model}.#{prefix}_dialog_existing == 'create'",
                               "checkchange" => ""}