diff --git a/app/src/main/java/de/sebse/fuplanner/MainActivity.java b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
index c8540bd..0c0ea91 100644
--- a/app/src/main/java/de/sebse/fuplanner/MainActivity.java
+++ b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
@@ -798,8 +798,8 @@ public class MainActivity extends AppCompatActivity
         }
 
         String email = "";
-        if (tokenKVV != null && !TextUtils.isEmpty(tokenKVV.getEmail())) {
-            email = tokenKVV.getFullName();
+        if (tokenKVV != null && !TextUtils.isEmpty(tokenKVV.getEmail()) && !"null".equals(tokenKVV.getEmail())) {
+            email = tokenKVV.getEmail();
         } else if (tokenBB != null && !TextUtils.isEmpty(tokenBB.getUsername())) {
             email = tokenBB.getUsername() + "@zedat.fu-berlin.de";
         }