diff --git a/vorgang-manager-command/src/main/java/de/ozgcloud/command/Command.java b/vorgang-manager-command/src/main/java/de/ozgcloud/command/Command.java
index 03beadfa1d78503796ab49ce66050226de991ee9..4e0940d8a4cd12dc6acf8970c7cae612e4aac9be 100644
--- a/vorgang-manager-command/src/main/java/de/ozgcloud/command/Command.java
+++ b/vorgang-manager-command/src/main/java/de/ozgcloud/command/Command.java
@@ -44,7 +44,7 @@ public interface Command {
 	public String getCreatedBy();
 	public String getCreatedByName();
 	public CommandStatus getStatus();
-	String getCreatedByClient();
+	String getCreatedByClientName();
 
 	public Map<String, Object> getBodyObject();
 	public Map<String, String> getBody();
diff --git a/vorgang-manager-command/src/test/java/de/ozgcloud/command/TestCommand.java b/vorgang-manager-command/src/test/java/de/ozgcloud/command/TestCommand.java
index 3d2c5d8263bd630782c6b968d50c265e15c0597c..98a46f1f9f5423cf0b04d51e208e985dfaa607d7 100644
--- a/vorgang-manager-command/src/test/java/de/ozgcloud/command/TestCommand.java
+++ b/vorgang-manager-command/src/test/java/de/ozgcloud/command/TestCommand.java
@@ -21,7 +21,7 @@ public class TestCommand implements Command {
 	private ZonedDateTime finishedAt;
 	private String createdBy;
 	private String createdByName;
-	private String createdByClient;
+	private String createdByClientName;
 
 	private CommandStatus status;
 
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/CommandService.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/CommandService.java
index ff7653e640230c195b26595b3b50c0589f305303..e4432b43d66b95c1c21cffa0c1aa5321eaf4fe0b 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/CommandService.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/CommandService.java
@@ -87,6 +87,7 @@ public class CommandService {
 				.body(request.getBody())
 				.bodyObject(request.getBodyObject());
 
+		userService.findUser().map(CallContextUser::getClientName).ifPresent(builder::createdByClientName);
 		builder = addUserIfExists(builder, Optional.ofNullable(request.getCallContext()).map(CallContext::getUser), userService.findUser());
 		return builder.build();
 	}
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/PersistedCommand.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/PersistedCommand.java
index 0973a39797c8235f7d02f1ee9a3bb363ae235817..7e045d3e121d5971d33c910c5c717b1a5822d045 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/PersistedCommand.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/PersistedCommand.java
@@ -63,7 +63,7 @@ public class PersistedCommand implements Command {
 
 	private String createdBy;
 	private String createdByName;
-	private String createdByClient;
+	private String createdByClientName;
 
 	@Setter
 	private CommandStatus status;
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/VorgangService.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/VorgangService.java
index 801685f1f65300819e724da8b4811399b75a6a49..ec32c6183d9e8f90bdb4d3f3b02afd64ebb1980c 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/VorgangService.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/VorgangService.java
@@ -237,7 +237,7 @@ public class VorgangService {
 	}
 
 	void validateLockCommand(Command command) {
-		if (Objects.isNull(command.getCreatedByClient())) {
+		if (Objects.isNull(command.getCreatedByClientName())) {
 			throw new TechnicalException("Missing client name in lock command");
 		}
 		if (Objects.isNull(getReason(command.getBodyObject()))) {
@@ -247,7 +247,7 @@ public class VorgangService {
 
 	Map<String, Object> buildLockPatch(Command command) {
 		return Map.of(KEY_HEADER_LOCK, Map.of(
-				Lock.FIELD_CLIENT_NAME, command.getCreatedByClient(),
+				Lock.FIELD_CLIENT_NAME, command.getCreatedByClientName(),
 				Lock.FIELD_LOCKED_SINCE, ZonedDateTime.now(ZoneId.of("UTC")),
 				Lock.FIELD_REASON, getReason(command.getBodyObject())));
 	}
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandServiceTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandServiceTest.java
index 3f4d68d90efa91280762ec75d49a7692d352a175..dfb6e5119132536daf1cdd17113f7fac46b2628c 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandServiceTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandServiceTest.java
@@ -102,6 +102,15 @@ class CommandServiceTest {
 			assertThat(command.getRelationVersion()).isEqualTo(CreateCommandRequestTestFactory.RELATION_VERSION);
 		}
 
+		@Test
+		void shouldSetClientName() {
+			when(currentUserService.findUser()).thenReturn(Optional.of(CallContextUserTestFactory.create()));
+
+			var command = (PersistedCommand) service.createCommand(request);
+
+			assertThat(command.getCreatedByClientName()).isEqualTo(CallContextTestFactory.CLIENT);
+		}
+
 		@Test
 		void shouldHandleMissingCallContext() {
 			var request = CreateCommandRequestTestFactory.createBuilder().callContext(null).build();
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandTestFactory.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandTestFactory.java
index 47f9149c3e6ccb74edeb5add3842b81b02cd7646..c87132fce74264ffcb34a894b036e0f6351fe7e7 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandTestFactory.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandTestFactory.java
@@ -61,7 +61,7 @@ public class CommandTestFactory {
 				.createdAt(CREATED_AT)
 				.createdBy(CREATED_BY)
 				.createdByName(CREATED_BY_NAME)
-				.createdByClient(CREATED_BY_CLIENT)
+				.createdByClientName(CREATED_BY_CLIENT)
 				.status(STATUS)
 				.relationId(RELATION_ID)
 				.relationVersion(RELATION_VERSION)
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangServiceTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangServiceTest.java
index db34a67ab574fbeb28cf458ef75766e20714943c..3a3d53b5c424ace826618b7afed13b8fb0feb6b7 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangServiceTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangServiceTest.java
@@ -563,7 +563,7 @@ class VorgangServiceTest {
 
 		@Test
 		void shouldThrowExceptionOnMissingClient() {
-			var command = CommandTestFactory.createBuilder().createdByClient(null).build();
+			var command = CommandTestFactory.createBuilder().createdByClientName(null).build();
 
 			assertThrows(TechnicalException.class, () -> service.validateLockCommand(command));
 		}