diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContact.java b/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContact.java
index 63d6cfd5..d528e7c4 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContact.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContact.java
@@ -42,6 +42,7 @@ public class HsOfficeContact implements Stringifyable, BaseEntity<HsOfficeContac
 
     private static Stringify<HsOfficeContact> toString = stringify(HsOfficeContact.class, "contact")
             .withProp(Fields.caption, HsOfficeContact::getCaption)
+            .withProp(Fields.postalAddress, HsOfficeContact::getPostalAddress)
             .withProp(Fields.emailAddresses, HsOfficeContact::getEmailAddresses);
 
     @Id
@@ -59,6 +60,7 @@ public class HsOfficeContact implements Stringifyable, BaseEntity<HsOfficeContac
     @Setter(AccessLevel.NONE)
     @Type(JsonType.class)
     @Column(name = "postaladdress")
+    // Map can contain keys like: "department", "street", "zipcode", "city", "country", etc.
     private Map<String, String> postalAddress = new HashMap<>();
 
     @Transient
diff --git a/src/test/java/net/hostsharing/hsadminng/errors/RestResponseEntityExceptionHandlerRestTest.java b/src/test/java/net/hostsharing/hsadminng/errors/RestResponseEntityExceptionHandlerRestTest.java
index 040c7bdf..faba2e9d 100644
--- a/src/test/java/net/hostsharing/hsadminng/errors/RestResponseEntityExceptionHandlerRestTest.java
+++ b/src/test/java/net/hostsharing/hsadminng/errors/RestResponseEntityExceptionHandlerRestTest.java
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @WebMvcTest(controllers = RestResponseEntityExceptionHandlerRestTest.TestController.class)
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactUnitTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactUnitTest.java
index de61688a..fe261f2c 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactUnitTest.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactUnitTest.java
@@ -3,6 +3,9 @@ package net.hostsharing.hsadminng.hs.office.contact;
 import net.hostsharing.hsadminng.rbac.generator.RbacViewMermaidFlowchartGenerator;
 import org.junit.jupiter.api.Test;
 
+import java.util.Map;
+
+import static java.util.Map.entry;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class HsOfficeContactUnitTest {
@@ -14,9 +17,31 @@ class HsOfficeContactUnitTest {
     }
 
     @Test
-    void toStringReturnsCaption() {
-        final var givenContact = HsOfficeContactRbacEntity.builder().caption("given caption").build();
-        assertThat("" + givenContact).isEqualTo("contact(caption='given caption')");
+    void toStringDescribesAllDomainProperties() {
+        final var givenContact = HsOfficeContactRbacEntity.builder()
+                .caption("given caption")
+                .postalAddress(Map.ofEntries(
+                        entry("department", "Rechnungsabteilung"),
+                        entry("street", "Teststraße 11"),
+                        entry("zipcode", "D-12345"),
+                        entry("city", "Berlin")
+                ))
+                .emailAddresses(Map.ofEntries(
+                        Map.entry("main", "main@example.org"),
+                        Map.entry("sender", "sender@example.org")
+                ))
+                .build();
+        assertThat("" + givenContact).isEqualTo("""
+                contact(caption='given caption', postalAddress='{
+                  "city" : "Berlin",
+                  "department" : "Rechnungsabteilung",
+                  "street" : "Teststraße 11",
+                  "zipcode" : "D-12345"
+                }', emailAddresses='{
+                  "main" : "main@example.org",
+                  "sender" : "sender@example.org"
+                }')
+                """.trim());
     }
 
     @Test
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/HsOfficeScenarioTests.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/HsOfficeScenarioTests.java
index 368bf2b9..3ef5685d 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/HsOfficeScenarioTests.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/HsOfficeScenarioTests.java
@@ -119,6 +119,7 @@ class HsOfficeScenarioTests extends ScenarioTest {
                     .given(
                             "postalAddress", """
                                             "firm": "Test AG",
+                                            "department": "Geschäftsleitung",
                                             "street": "Shanghai-Allee 1",
                                             "zipcode": "20123",
                                             "city": "Hamburg",
@@ -261,8 +262,7 @@ class HsOfficeScenarioTests extends ScenarioTest {
                     .given("newContactCaption", "Test AG - China")
                     .given(
                             "newPostalAddress", """
-                                             "firm": "Test AG",
-                                             "name": "Fi Zhong-Kha",
+                                             "department": "Executive Board",
                                              "building": "Thi Chi Koh Building",
                                              "street": "No.2 Commercial Second Street",
                                              "district": "Niushan Wei Wu",