diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsFragment.kt
index a9890ad9a..c3137ec58 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsFragment.kt
@@ -121,10 +121,14 @@ class AccountDetailsFragment :
         }
     }
 
-    override fun popView() {
+    override fun popViewToMain() {
         (requireActivity() as MainActivity).popView(2)
     }
 
+    override fun popViewToAccounts() {
+        (requireActivity() as MainActivity).popView(1)
+    }
+
     override fun recreateMainView() {
         requireActivity().recreate()
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsPresenter.kt
index d4cba580a..1f44cbbc3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsPresenter.kt
@@ -119,7 +119,7 @@ class AccountDetailsPresenter @Inject constructor(
                     }
                 }
             }.afterLoading {
-                view?.popView()
+                view?.popViewToMain()
             }.launch("switch")
     }
 
@@ -152,11 +152,14 @@ class AccountDetailsPresenter @Inject constructor(
                             syncManager.stopSyncWorker()
                             openClearLoginView()
                         }
-                        studentWithSemesters!!.student.isCurrent -> {
+                        studentWithSemesters?.student?.isCurrent == true -> {
                             Timber.i("Logout result: Logout student and switch to another")
                             recreateMainView()
                         }
-                        else -> Timber.i("Logout result: Logout student")
+                        else -> {
+                            Timber.i("Logout result: Logout student")
+                            recreateMainView()
+                        }
                     }
                 }
                 Status.ERROR -> {
@@ -165,7 +168,11 @@ class AccountDetailsPresenter @Inject constructor(
                 }
             }
         }.afterLoading {
-            view?.popView()
+            if (studentWithSemesters?.student?.isCurrent == true) {
+                view?.popViewToMain()
+            } else {
+                view?.popViewToAccounts()
+            }
         }.launch("logout")
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsView.kt
index 652f0c1aa..aeb743fa5 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsView.kt
@@ -15,7 +15,9 @@ interface AccountDetailsView : BaseView {
 
     fun showLogoutConfirmDialog()
 
-    fun popView()
+    fun popViewToMain()
+
+    fun popViewToAccounts()
 
     fun recreateMainView()