diff --git a/fachstelle-server/src/main/java/de/ozgcloud/fachstelle/security/UserAttributeProvider.java b/fachstelle-server/src/main/java/de/ozgcloud/fachstelle/security/UserAttributeProvider.java
index 8dcc91914522f3a324362d0fa2d5b91570d98700..7d1d8f4be3dfa8977c1b81dfb85e4571a342094a 100644
--- a/fachstelle-server/src/main/java/de/ozgcloud/fachstelle/security/UserAttributeProvider.java
+++ b/fachstelle-server/src/main/java/de/ozgcloud/fachstelle/security/UserAttributeProvider.java
@@ -88,11 +88,12 @@ class UserAttributeProvider {
 			var nodeName = node.getElementQName().getLocalPart();
 			var textContent = Objects.requireNonNull(node.getDOM()).getTextContent().trim();
 
-			addressBuilder.append(textContent);
 			if (SAML_XML_STRASSE_NODE_NAME.equals(nodeName) || SAML_XML_PLZ_NODE_NAME.equals(nodeName)) {
-				addressBuilder.append(" ");
+				addressBuilder.append(textContent).append(" ");
 			} else if (SAML_XML_HAUSNUMMER_NODE_NAME.equals(nodeName) || SAML_XML_ORT_NODE_NAME.equals(nodeName)) {
-				addressBuilder.append(", ");
+				addressBuilder.append(textContent).append(", ");
+			} else if (SAML_XML_LAND_NODE_NAME.equals(nodeName)) {
+				addressBuilder.append(textContent);
 			}
 		}