diff --git a/wherehows-web/app/components/dataset-compliance.js b/wherehows-web/app/components/dataset-compliance.js
index e3935b1ec6..4969681421 100644
--- a/wherehows-web/app/components/dataset-compliance.js
+++ b/wherehows-web/app/components/dataset-compliance.js
@@ -569,7 +569,7 @@ export default Component.extend({
       identifierField,
       identifierType,
       logicalType,
-      classification
+      securityClassification: classification
     }));
     // Fields that do not have a logicalType, and no identifierType or identifierType is `fieldIdentifierTypes.none`
     const { formatted, unformatted } = datasetFields.reduce(
@@ -593,8 +593,8 @@ export default Component.extend({
       unformattedComplianceEntities = unformatted.map(({ identifierField }) => ({
         identifierField,
         identifierType: fieldIdentifierTypes.none.value,
-        logicalType: void 0,
-        classification: void 0
+        logicalType: null,
+        securityClassification: null
       }));
 
       isConfirmed = confirm(
diff --git a/wherehows-web/app/controllers/datasets/dataset.js b/wherehows-web/app/controllers/datasets/dataset.js
index e6682bead3..d999d22b3e 100644
--- a/wherehows-web/app/controllers/datasets/dataset.js
+++ b/wherehows-web/app/controllers/datasets/dataset.js
@@ -19,7 +19,7 @@ export default Ember.Controller.extend({
   latestVersion: '0',
   ownerTypes: [],
   datasetSchemaFieldsAndTypes: [],
-  userTypes: [{ name: 'Corporate User', value: 'urn:li:corpuser' }, { name: 'Group User', value: 'urn:li:griduser' }],
+  userTypes: [{ name: 'Corporate User', value: 'urn:li:corpuser' }, { name: 'Group User', value: 'urn:li:corpGroup' }],
   isPinot: function() {
     var model = this.get('model');
     if (model) {