diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapper.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapper.java
index 8f6d5714d9c4211f2a01efc0631efafda6cdd661..ca2988c4229c0565acaaa6024e0ccde4100863b3 100644
--- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapper.java
+++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapper.java
@@ -57,22 +57,14 @@ interface KeycloakRealmMapper {
 
 		Map<String, String> smtpServer = new HashMap<>();
 		if (server != null) {
-			if (server.getHost() != null)
-				smtpServer.put("host", server.getHost());
-			if (server.getPort() != null)
-				smtpServer.put("port", server.getPort());
-			if (server.getUser() != null)
-				smtpServer.put("user", server.getUser());
-			if (server.getPassword() != null)
-				smtpServer.put("password", server.getPassword());
-			if (server.getStarttls() != null)
-				smtpServer.put("starttls", server.getStarttls());
-			if (server.getAuth() != null)
-				smtpServer.put("auth", server.getAuth());
-			if (server.getFrom() != null)
-				smtpServer.put("from", server.getFrom());
-			if (server.getFromDisplayName() != null)
-				smtpServer.put("fromDisplayName", server.getFromDisplayName());
+			smtpServer.put("host", server.getHost());
+			smtpServer.put("port", server.getPort());
+			smtpServer.put("user", server.getUser());
+			smtpServer.put("password", server.getPassword());
+			smtpServer.put("starttls", server.getStarttls());
+			smtpServer.put("auth", server.getAuth());
+			smtpServer.put("from", server.getFrom());
+			smtpServer.put("fromDisplayName", server.getFromDisplayName());
 		}
 		return smtpServer;