diff --git a/app/src/main/java/de/sebse/fuplanner/MainActivity.java b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
index 1a59f34..5dfd535 100644
--- a/app/src/main/java/de/sebse/fuplanner/MainActivity.java
+++ b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
@@ -189,7 +189,6 @@ public class MainActivity extends AppCompatActivity
                         this.getGoogleAuth().deleteLoginState(credentials.getUsername(), credentials.getPassword());
                     }
                 });
-                this.toLogoutState();
                 break;
 
         }
@@ -425,7 +424,7 @@ public class MainActivity extends AppCompatActivity
     }
 
     private void afterAnyMenuInflate(boolean isLoggedIn, Runnable done) {
-        int MAX_COUNT = 2;
+        int MAX_COUNT = isLoggedIn ? 2 : 1;
         final int[] count = {0};
         if (isLoggedIn) {
             getKVV().modules().list().recv(success -> {
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Semester.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Semester.java
index 1e81d70..76605aa 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Semester.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Semester.java
@@ -1,9 +1,11 @@
 package de.sebse.fuplanner.services.KVV.types;
 
+import java.io.Serializable;
+
 import androidx.annotation.Nullable;
 import de.sebse.fuplanner.tools.Regex;
 
-public class Semester {
+public class Semester implements Serializable {
     public static final int SEM_WS = 1;
     public static final int SEM_SS = 2;
     private int type;