diff --git a/apps/server/src/modules/account/review-comments.md b/apps/server/src/modules/account/review-comments.md
index 3390261fa0b..88872b03821 100644
--- a/apps/server/src/modules/account/review-comments.md
+++ b/apps/server/src/modules/account/review-comments.md
@@ -1,10 +1,12 @@
 # Review Comments 14.7.23
 
+- Remove lookup service, move to idm and db
+- Adjust Account DO
+- Move Account Entity
+
 - write an md file or flow diagram describing how things work
 - in what layer do the services belong?
 
-- naming of DO vs Entity (DO is the leading, "Account", entity is just the datalayer representation "AccountEntity")
-
 - new decisions for loggables
 
 
diff --git a/apps/server/src/modules/account/uc/account.uc.ts b/apps/server/src/modules/account/uc/account.uc.ts
index b7949089bab..c3dff9d3e38 100644
--- a/apps/server/src/modules/account/uc/account.uc.ts
+++ b/apps/server/src/modules/account/uc/account.uc.ts
@@ -87,7 +87,7 @@ export class AccountUc {
 			const account = await this.accountService.findByUserId(query.value);
 			if (account) {
 				// HINT: skip and limit should be from the query
-				return new ResolvedSearchListAccountDto([AccountResponseMapper.mapToAccountResponse(account)], 1, 0, 1);
+				return new ResolvedSearchListAccountDto([AccountUcMapper.mapToResolvedAccountDto(account)], 1, 0, 1);
 			}
 			// HINT: skip and limit should be from the query
 			return new ResolvedSearchListAccountDto([], 0, 0, 0);