diff --git a/src/components/FormFields/UploadKey.vue b/src/components/FormFields/UploadKey.vue
index e45ba2fba..81697c686 100644
--- a/src/components/FormFields/UploadKey.vue
+++ b/src/components/FormFields/UploadKey.vue
@@ -50,7 +50,7 @@ export default {
       const reader = new FileReader()
       reader.onload = function() {
         let result = this.result
-        if (vm.toFormat === 'object') {
+        if (vm.toFormat === 'object' && vm.fileName.endsWith('.json')) {
           result = JSON.parse(result)
         }
         vm.$emit('input', result)
diff --git a/src/views/assets/Cloud/Account/AccountCreateUpdate.vue b/src/views/assets/Cloud/Account/AccountCreateUpdate.vue
index d76c96602..0bedc8a2e 100644
--- a/src/views/assets/Cloud/Account/AccountCreateUpdate.vue
+++ b/src/views/assets/Cloud/Account/AccountCreateUpdate.vue
@@ -91,13 +91,17 @@ export default {
         const attrs = values.attrs
         for (const item of encryptedFields) {
           const value = attrs[item]
-          if (value) {
-            attrs[item] = encryptPassword(value)
+          if (!value) {
+            continue
           }
+          attrs[item] = encryptPassword(value)
         }
         const toListFields = ['ip_group']
         for (const item of toListFields) {
           let value = attrs[item]
+          if (!value) {
+            continue
+          }
           value = value?.split(',') || []
           value = value.filter((value, index) => { if (value) return true })
           attrs[item] = value