diff --git a/WireDomain/Sources/WireDomain/Repositories/User/UserLocalStore.swift b/WireDomain/Sources/WireDomain/Repositories/User/UserLocalStore.swift
index 540c6ba8c21..7b21158ef00 100644
--- a/WireDomain/Sources/WireDomain/Repositories/User/UserLocalStore.swift
+++ b/WireDomain/Sources/WireDomain/Repositories/User/UserLocalStore.swift
@@ -343,7 +343,7 @@ public final class UserLocalStore: UserLocalStoreProtocol {
             persistedUser.teamIdentifier = userInfo.teamID
             persistedUser.accentColorValue = Int16(userInfo.accentID)
             persistedUser.previewProfileAssetIdentifier = userInfo.previewAssetKey
-            persistedUser.previewProfileAssetIdentifier = userInfo.completeAssetKey
+            persistedUser.completeProfileAssetIdentifier = userInfo.completeAssetKey
             persistedUser.emailAddress = userInfo.email
             persistedUser.expiresAt = userInfo.expiresAt
             if let appDescription = userInfo.appDescription, let appCategory = userInfo.appCategory {
diff --git a/wire-ios-data-model/Source/UseCases/AccountImageSource/GetUserAccountImageSourceUseCase.swift b/wire-ios-data-model/Source/UseCases/AccountImageSource/GetUserAccountImageSourceUseCase.swift
index c5af2664a57..ee9429d3f9c 100644
--- a/wire-ios-data-model/Source/UseCases/AccountImageSource/GetUserAccountImageSourceUseCase.swift
+++ b/wire-ios-data-model/Source/UseCases/AccountImageSource/GetUserAccountImageSourceUseCase.swift
@@ -31,8 +31,11 @@ public struct GetUserAccountImageSourceUseCase: GetUserAccountImageSourceUseCase
         account: Account
     ) async throws -> AccountImageSource {
 
-        // user's custom image
-        if let data = account.imageData, let accountImage = UIImage(data: data) {
+        // user's custom image (check account first, fall back to user
+        // in case it's not set on account yet).
+        if
+            let data = account.imageData ?? user.imageData(for: .preview),
+            let accountImage = UIImage(data: data) {
             return .image(accountImage)
         }