diff --git a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
index 5ccf7d461..bb9cfbd3e 100644
--- a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
@@ -183,6 +183,7 @@ public class LoginActivity extends AccountAuthenticatorActivity {
         if (sessionManager.getCurrentAccount() != null
                 && sessionManager.isUserLoggedIn()
                 && sessionManager.getCachedAuthCookie() != null) {
+            
             startMainActivity();
         }
     }
diff --git a/app/src/main/java/fr/free/nrw/commons/settings/Prefs.java b/app/src/main/java/fr/free/nrw/commons/settings/Prefs.java
index 1142c7e3b..722733393 100644
--- a/app/src/main/java/fr/free/nrw/commons/settings/Prefs.java
+++ b/app/src/main/java/fr/free/nrw/commons/settings/Prefs.java
@@ -7,7 +7,6 @@ public class Prefs {
     public static final String DEFAULT_LICENSE = "defaultLicense";
     public static final String UPLOADS_SHOWING = "uploadsshowing";
     public static final String IS_CONTRIBUTION_COUNT_CHANGED = "ccontributionCountChanged";
-    public static final String IS_LOGGED_IN = "isloggedin";
 
     public static class Licenses {
         public static final String CC_BY_SA_3 = "CC BY-SA 3.0";
diff --git a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
index 12477794b..2a0bf1290 100644
--- a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
@@ -28,7 +28,6 @@ import fr.free.nrw.commons.AboutActivity;
 import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.WelcomeActivity;
 import fr.free.nrw.commons.auth.AccountUtil;
 import fr.free.nrw.commons.auth.LoginActivity;
@@ -50,6 +49,7 @@ public abstract class NavigationBaseActivity extends BaseActivity
     DrawerLayout drawerLayout;
     @Inject @Named("application_preferences") SharedPreferences prefs;
 
+
     private ActionBarDrawerToggle toggle;
 
     public void initDrawer() {
@@ -64,6 +64,23 @@ public abstract class NavigationBaseActivity extends BaseActivity
         toggle.syncState();
         setDrawerPaneWidth();
         setUserName();
+        Menu nav_Menu = navigationView.getMenu();
+        if (prefs.getBoolean("isloggedin", true)) {
+            Toast.makeText(this,"LoggedIn",Toast.LENGTH_SHORT).show();
+            nav_Menu.findItem(R.id.action_login).setVisible(false);
+            nav_Menu.findItem(R.id.action_home).setVisible(true);
+            nav_Menu.findItem(R.id.action_notifications).setVisible(true);
+            nav_Menu.findItem(R.id.action_settings).setVisible(true);
+            nav_Menu.findItem(R.id.action_logout).setVisible(true);
+
+        }else {
+            Toast.makeText(this,"Skipped",Toast.LENGTH_SHORT).show();
+            nav_Menu.findItem(R.id.action_login).setVisible(true);
+            nav_Menu.findItem(R.id.action_home).setVisible(false);
+            nav_Menu.findItem(R.id.action_notifications).setVisible(false);
+            nav_Menu.findItem(R.id.action_settings).setVisible(false);
+            nav_Menu.findItem(R.id.action_logout).setVisible(false);
+        }
     }
 
     /**
@@ -103,30 +120,17 @@ public abstract class NavigationBaseActivity extends BaseActivity
         navigationView.setLayoutParams(params);
     }
 
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        super.onPrepareOptionsMenu(menu);
-        if (prefs.getBoolean("isloggedin", true)) {
-            menu.findItem(R.id.action_login).setVisible(false);
-            menu.findItem(R.id.action_home).setVisible(true);
-            menu.findItem(R.id.action_notifications).setVisible(true);
-            menu.findItem(R.id.action_settings).setVisible(true);
-            menu.findItem(R.id.action_logout).setVisible(true);
-
-        }else {
-            menu.findItem(R.id.action_login).setVisible(true);
-            menu.findItem(R.id.action_home).setVisible(false);
-            menu.findItem(R.id.action_notifications).setVisible(false);
-            menu.findItem(R.id.action_settings).setVisible(false);
-            menu.findItem(R.id.action_logout).setVisible(false);
-        }
-        return true;
-    }
-
     @Override
     public boolean onNavigationItemSelected(@NonNull final MenuItem item) {
         final int itemId = item.getItemId();
         switch (itemId) {
+            case R.id.action_login:
+                drawerLayout.closeDrawer(navigationView);
+                startActivityWithFlags(
+                        this, LoginActivity.class, Intent.FLAG_ACTIVITY_CLEAR_TOP,
+                        Intent.FLAG_ACTIVITY_SINGLE_TOP);
+                finish();
+                return true;
             case R.id.action_home:
                 drawerLayout.closeDrawer(navigationView);
                 startActivityWithFlags(