diff --git a/app/src/main/java/de/sebse/fuplanner/MainActivity.java b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
index 4baebdc..fa81edd 100644
--- a/app/src/main/java/de/sebse/fuplanner/MainActivity.java
+++ b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
@@ -85,14 +85,17 @@ public class MainActivity extends AppCompatActivity
         mNavigationView.setNavigationItemSelectedListener(this);
         fragmentManager = getSupportFragmentManager();
 
+        LoginToken loginToken = getKVV().easyLogin();
         if (newFragmentPage != FRAGMENT_LOGIN && newFragmentPage != FRAGMENT_STARTUP && newFragmentPage != FRAGMENT_NONE) {
-            LoginToken loginToken = getKVV().easyLogin();
             if (loginToken != null)
                 toLoginState(loginToken, newFragmentPage, newFragmentData);
             else
                 checkAndDoLogin();
         } else {
-            checkAndDoLogin();
+            if (loginToken != null)
+                toLoginState(loginToken, getDefaultFragmentAfterLogin(), "");
+            else
+                checkAndDoLogin();
         }
     }
 
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index cc487e1..2a943ce 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -44,7 +44,6 @@
         android:id="@+id/login_mail"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="@dimen/nav_header_vertical_spacing"
         tools:text="Android Studio"
         android:textAppearance="@style/TextAppearance.AppCompat.Body1"
         android:visibility="gone"  />