diff --git a/scm-ui/ui-types/src/Me.ts b/scm-ui/ui-types/src/Me.ts
index 38a3a23278..d8595e0771 100644
--- a/scm-ui/ui-types/src/Me.ts
+++ b/scm-ui/ui-types/src/Me.ts
@@ -27,7 +27,8 @@ import { Links } from "./hal";
 export type Me = {
   name: string;
   displayName: string;
-  mail: string;
+  mail?: string;
+  fallbackMail?: string;
   groups: string[];
   _links: Links;
 };
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeDto.java
index 968d892536..b4e011f7bb 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeDto.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeDto.java
@@ -21,9 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-    
+
 package sonia.scm.api.v2.resources;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import de.otto.edison.hal.Embedded;
 import de.otto.edison.hal.HalRepresentation;
 import de.otto.edison.hal.Links;
@@ -40,7 +41,10 @@ public class MeDto extends HalRepresentation {
 
   private String name;
   private String displayName;
+  @JsonInclude(JsonInclude.Include.NON_NULL)
   private String mail;
+  @JsonInclude(JsonInclude.Include.NON_NULL)
+  private String fallbackMail;
   private Set<String> groups;
 
   MeDto(Links links, Embedded embedded) {
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeDtoFactory.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeDtoFactory.java
index 2101ba2ffb..2bc72d509a 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeDtoFactory.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeDtoFactory.java
@@ -24,12 +24,14 @@
 
 package sonia.scm.api.v2.resources;
 
+import com.google.common.base.Strings;
 import de.otto.edison.hal.Embedded;
 import de.otto.edison.hal.Links;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.PrincipalCollection;
 import org.apache.shiro.subject.Subject;
 import sonia.scm.group.GroupCollector;
+import sonia.scm.user.EMail;
 import sonia.scm.user.User;
 import sonia.scm.user.UserManager;
 import sonia.scm.user.UserPermissions;
@@ -46,12 +48,14 @@ public class MeDtoFactory extends HalAppenderMapper {
   private final ResourceLinks resourceLinks;
   private final UserManager userManager;
   private final GroupCollector groupCollector;
+  private final EMail eMail;
 
   @Inject
-  public MeDtoFactory(ResourceLinks resourceLinks, UserManager userManager, GroupCollector groupCollector) {
+  public MeDtoFactory(ResourceLinks resourceLinks, UserManager userManager, GroupCollector groupCollector, EMail eMail) {
     this.resourceLinks = resourceLinks;
     this.userManager = userManager;
     this.groupCollector = groupCollector;
+    this.eMail = eMail;
   }
 
   public MeDto create() {
@@ -61,6 +65,7 @@ public class MeDtoFactory extends HalAppenderMapper {
     MeDto dto = createDto(user);
     mapUserProperties(user, dto);
     mapGroups(user, dto);
+    setGeneratedMail(user, dto);
     return dto;
   }
 
@@ -79,6 +84,12 @@ public class MeDtoFactory extends HalAppenderMapper {
     return subject.getPrincipals();
   }
 
+  private void setGeneratedMail(User user, MeDto dto) {
+    if (Strings.isNullOrEmpty(user.getMail())) {
+      dto.setFallbackMail(eMail.createFallbackMailAddress(user));
+    }
+  }
+
 
   private MeDto createDto(User user) {
     Links.Builder linksBuilder = linkingTo().self(resourceLinks.me().self());
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MeDtoFactoryTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MeDtoFactoryTest.java
index 901d625579..2a4cea9626 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MeDtoFactoryTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MeDtoFactoryTest.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-    
+
 package sonia.scm.api.v2.resources;
 
 import com.google.common.collect.ImmutableSet;
@@ -38,9 +38,9 @@ import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
 import sonia.scm.SCMContext;
 import sonia.scm.group.GroupCollector;
+import sonia.scm.user.EMail;
 import sonia.scm.user.User;
 import sonia.scm.user.UserManager;
-import sonia.scm.user.UserPermissions;
 import sonia.scm.user.UserTestData;
 
 import java.net.URI;
@@ -65,13 +65,16 @@ class MeDtoFactoryTest {
   @Mock
   private Subject subject;
 
+  @Mock
+  private EMail eMail;
+
   private MeDtoFactory meDtoFactory;
 
   @BeforeEach
   void setUpContext() {
     ThreadContext.bind(subject);
     ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri);
-    meDtoFactory = new MeDtoFactory(resourceLinks, userManager, groupCollector);
+    meDtoFactory = new MeDtoFactory(resourceLinks, userManager, groupCollector, eMail);
   }
 
   @AfterEach
@@ -235,4 +238,17 @@ class MeDtoFactoryTest {
     MeDto dto = meDtoFactory.create();
     assertThat(dto.getLinks().getLinkBy("profile").get().getHref()).isEqualTo("http://hitchhiker.com/users/trillian");
   }
+
+  @Test
+  void shouldUserGeneratedMailOnlyWhenUserHasNone() {
+    User user = UserTestData.createTrillian();
+    user.setMail(null);
+    prepareSubject(user);
+    when(eMail.createFallbackMailAddress(user)).thenReturn("trillian@hitchhiker.local");
+
+    MeDto dto = meDtoFactory.create();
+
+    assertThat(dto.getMail()).isNull();
+    assertThat(dto.getFallbackMail()).isEqualTo("trillian@hitchhiker.local");
+  }
 }