diff --git a/user-manager-interface/src/main/proto/userprofile.model.proto b/user-manager-interface/src/main/proto/userprofile.model.proto
index f4e97598853a044e31dc5d56819e61019243bb3e..8cadd28eda0a7f52d1140844c8ea984f676a46ea 100644
--- a/user-manager-interface/src/main/proto/userprofile.model.proto
+++ b/user-manager-interface/src/main/proto/userprofile.model.proto
@@ -33,6 +33,7 @@ message GrpcUserProfile {
   string id = 1;
   string firstName = 2;
   string lastName = 3;
+  string email = 4;
 }
 
 
diff --git a/user-manager-server/src/main/java/de/ozgcloud/user/userprofile/UserProfileMapper.java b/user-manager-server/src/main/java/de/ozgcloud/user/userprofile/UserProfileMapper.java
index 8f16ad1bf42f42a9cc40834612889d4c8eb9fc24..c29c5e8d949d498714bc39c1fa38623b2c16f7fd 100644
--- a/user-manager-server/src/main/java/de/ozgcloud/user/userprofile/UserProfileMapper.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/userprofile/UserProfileMapper.java
@@ -25,16 +25,26 @@ package de.ozgcloud.user.userprofile;
 
 import org.bson.types.ObjectId;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
 import org.mapstruct.NullValueCheckStrategy;
 import org.mapstruct.ReportingPolicy;
 
 import de.ozgcloud.user.User;
 
 @Mapper(unmappedTargetPolicy = ReportingPolicy.WARN, //
-		unmappedSourcePolicy = ReportingPolicy.WARN, //
 		nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
 interface UserProfileMapper {
 
+	@Mapping(target = "emailBytes", ignore = true)
+	@Mapping(target = "mergeFrom", ignore = true)
+	@Mapping(target = "clearField", ignore = true)
+	@Mapping(target = "clearOneof", ignore = true)
+	@Mapping(target = "mergeUnknownFields", ignore = true)
+	@Mapping(target = "firstNameBytes", ignore = true)
+	@Mapping(target = "idBytes", ignore = true)
+	@Mapping(target = "lastNameBytes", ignore = true)
+	@Mapping(target = "unknownFields", ignore = true)
+	@Mapping(target = "allFields", ignore = true)
 	GrpcUserProfile mapTo(User userProfile);
 
 	default String toString(ObjectId objectId) {
diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileMapperTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileMapperTest.java
index c9002fa39f17b01261095f2412dea607549b07e0..fa280033555979187ac89125d3b219b44ff82429 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileMapperTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileMapperTest.java
@@ -56,6 +56,13 @@ class UserProfileMapperTest {
 			assertThat(userProfile.getLastName()).isEqualTo(UserTestFactory.LAST_NAME);
 		}
 
+		@Test
+		void shouldMapEMail() {
+			var userProfile = map();
+
+			assertThat(userProfile.getEmail()).isEqualTo(UserTestFactory.EMAIL);
+		}
+
 		@Test
 		void shouldMapId() {
 			var userProfile = map();