diff --git a/src/fireedge/etc/sunstone/profiles/base.template b/src/fireedge/etc/sunstone/profiles/base.template
index a43187903c8..34c10e31997 100644
--- a/src/fireedge/etc/sunstone/profiles/base.template
+++ b/src/fireedge/etc/sunstone/profiles/base.template
@@ -280,7 +280,7 @@
       SOCKETS: 1
       THREADS: 2
 
-  BACKUP:
+  Backup:
     BACKUP_CONFIG:
       BACKUP_VOLATILE: "Yes"
       FS_FREEZE: "AGENT"
diff --git a/src/fireedge/src/client/components/Forms/Datastore/CreateForm/Steps/ConfigurationAttributes/schema.js b/src/fireedge/src/client/components/Forms/Datastore/CreateForm/Steps/ConfigurationAttributes/schema.js
index f1c05696495..d09a36e7fcd 100644
--- a/src/fireedge/src/client/components/Forms/Datastore/CreateForm/Steps/ConfigurationAttributes/schema.js
+++ b/src/fireedge/src/client/components/Forms/Datastore/CreateForm/Steps/ConfigurationAttributes/schema.js
@@ -37,7 +37,7 @@ const COMPATIBLE_SYSTEM_DATASTORES = {
     .default(() => undefined),
   fieldProps: {
     initialState: {
-      filters: [{ id: 'TYPE', value: 'SYSTEM' }],
+      filters: [{ id: 'type', value: 'SYSTEM_DS' }],
     },
   },
   dependOf: ['$general.TYPE', '$general.STORAGE_BACKEND'],