diff --git a/src/components/identities/AUserCBAIdentityEditor.vue b/src/components/identities/AUserCBAIdentityEditor.vue
index 870ad167799bedb9a935e7fdb10af8a8d3cb28fe..714dfb4f6d1bc425895bbe088041c1790ace9cb9 100644
--- a/src/components/identities/AUserCBAIdentityEditor.vue
+++ b/src/components/identities/AUserCBAIdentityEditor.vue
@@ -18,7 +18,7 @@ import { useI18n } from '@/i18n'
 
 type CBAProfileData = Pick<SteeringUser['cba'], 'username' | 'userToken'>
 
-const modelValue = defineModel<CBAProfileData>({ required: true })
+const modelValue = defineModel<CBAProfileData | null>({ required: true })
 const { t } = useI18n()
 
 const name = useCopy(() => modelValue.value?.username ?? '', {
diff --git a/src/components/identities/AUserEditor.vue b/src/components/identities/AUserEditor.vue
index 00b2aa8df29d011265ffcd0c24e48cb757d45e0a..aef74152fa7fb597bac93a17280e592995fc5f2f 100644
--- a/src/components/identities/AUserEditor.vue
+++ b/src/components/identities/AUserEditor.vue
@@ -33,12 +33,12 @@
 
     <FormGroup
       v-slot="{ disabled }"
-      :errors="profile.errors"
-      :is-saving="profile.isSaving"
+      :errors="cba.errors"
+      :is-saving="cba.isSaving"
       label="CBA"
       custom-control
     >
-      <AUserCBAIdentityEditor v-model="profile.value" :disabled="disabled" />
+      <AUserCBAIdentityEditor v-model="cba.value" :disabled="disabled" />
     </FormGroup>
   </FormTable>
 </template>
@@ -64,7 +64,7 @@ const user = computed(() => props.user)
 const firstName = useAPIObjectFieldCopy(userStore, user, 'firstName', { debounce: 2 })
 const lastName = useAPIObjectFieldCopy(userStore, user, 'lastName', { debounce: 2 })
 const email = useAPIObjectFieldCopy(userStore, user, 'email', { debounce: 2 })
-const profile = useAPIObjectFieldCopy(userStore, user, 'cba', {
+const cba = useAPIObjectFieldCopy(userStore, user, 'cba', {
   debounce: 0,
   isEqual(v1, v2) {
     return v1?.username === v2?.username && v1?.userToken === v2?.userToken