diff --git a/src/components/AccountCreateUpdateForm/index.vue b/src/components/AccountCreateUpdateForm/index.vue
index 6288c2ea1..5585aa2f6 100644
--- a/src/components/AccountCreateUpdateForm/index.vue
+++ b/src/components/AccountCreateUpdateForm/index.vue
@@ -12,6 +12,7 @@ import AutoDataForm from '@/components/AutoDataForm'
 import { UpdateToken } from '@/components/FormFields'
 import Select2 from '@/components/FormFields/Select2'
 import AssetSelect from '@/components/AssetSelect'
+import { encryptPassword } from '@/utils/crypto'
 
 export default {
   name: 'AccountCreateForm',
@@ -48,6 +49,7 @@ export default {
       },
       url: '/api/v1/accounts/accounts/',
       form: this.account || {},
+      encryptedFields: ['secret'],
       fields: [
         [this.$t('assets.Asset'), ['assets']],
         [this.$t('common.Basic'), ['name', 'username', ...this.controlShowField()]],
@@ -233,6 +235,7 @@ export default {
         form.secret = form[secretType]
         delete form[secretType]
       }
+      form.secret = encryptPassword(form.secret)
       if (this.account?.name) {
         this.$emit('edit', form)
       } else {
diff --git a/src/views/accounts/AccountChangeSecret/AccountChangeSecretCreateUpdate.vue b/src/views/accounts/AccountChangeSecret/AccountChangeSecretCreateUpdate.vue
index 83acac553..6ea61076e 100644
--- a/src/views/accounts/AccountChangeSecret/AccountChangeSecretCreateUpdate.vue
+++ b/src/views/accounts/AccountChangeSecret/AccountChangeSecretCreateUpdate.vue
@@ -24,6 +24,7 @@ export default {
         secret_strategy: 'specific'
       },
       url: '/api/v1/accounts/change-secret-automations/',
+      encryptedFields: ['secret'],
       fields: [
         [this.$t('common.Basic'), ['name']],
         [this.$t('xpack.Asset'), ['accounts', 'assets', 'nodes']],
diff --git a/src/views/accounts/AccountPush/AccountPushCreateUpdate.vue b/src/views/accounts/AccountPush/AccountPushCreateUpdate.vue
index 0c760152b..7e7dd5fce 100644
--- a/src/views/accounts/AccountPush/AccountPushCreateUpdate.vue
+++ b/src/views/accounts/AccountPush/AccountPushCreateUpdate.vue
@@ -25,6 +25,7 @@ export default {
         secret_strategy: 'specific'
       },
       url: '/api/v1/accounts/push-account-automations/',
+      encryptedFields: ['secret'],
       fields: [
         [this.$t('common.Basic'), ['name']],
         [this.$t('xpack.Asset'), ['accounts', 'assets', 'nodes']],
diff --git a/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue b/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue
index 3707d0492..e8b48b405 100644
--- a/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue
+++ b/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue
@@ -5,6 +5,7 @@
 <script>
 import GenericCreateUpdatePage from '@/layout/components/GenericCreateUpdatePage'
 import { templateFields, templateFieldsMeta } from './const.js'
+import { encryptPassword } from '@/utils/crypto'
 
 export default {
   name: 'GatewayCreateUpdate',
@@ -29,6 +30,7 @@ export default {
             delete value[item]
           }
         })
+        value['secret'] = encryptPassword(value['secret'])
         return value
       },
       createSuccessNextRoute: { name: 'AccountTemplateList' },
diff --git a/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue b/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue
index 458cee011..c1c1aba21 100644
--- a/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue
@@ -5,6 +5,7 @@
 <script>
 import GenericCreateUpdatePage from '@/layout/components/GenericCreateUpdatePage'
 import { assetFieldsMeta } from '@/views/assets/const'
+import { encryptPassword } from '@/utils/crypto'
 
 export default {
   components: { GenericCreateUpdatePage },
@@ -65,6 +66,11 @@ export default {
           if (values.nodes && values.nodes.length === 0) {
             delete values['nodes']
           }
+          const accounts = values?.accounts || []
+          values.accounts = accounts.map((item) => {
+            item['secret'] = encryptPassword(item['secret'])
+            return item
+          })
 
           return values
         }