diff --git a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
index 51dacdebb..71e5fe08d 100644
--- a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
+++ b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
@@ -494,14 +494,14 @@ class MailboxDashBoardController extends ReloadableController {
 
   void _handleSession(Session session) {
     log('MailboxDashBoardController::_handleSession:');
-    _setUpComponentsFromSession(session);
-
     updateAuthenticationAccount(
-      sessionCurrent!,
-      accountId.value!,
-      sessionCurrent!.username
+      session,
+      session.personalAccount.accountId,
+      session.username
     );
 
+    _setUpComponentsFromSession(session);
+
     if (PlatformInfo.isMobile && !_notificationManager.isNotificationClickedOnTerminate) {
       _handleClickLocalNotificationOnTerminated();
     } else {
@@ -510,21 +510,22 @@ class MailboxDashBoardController extends ReloadableController {
   }
 
   void _setUpComponentsFromSession(Session session) {
+    final currentAccountId = session.personalAccount.accountId;
     sessionCurrent = session;
-    accountId.value = sessionCurrent!.personalAccount.accountId;
-    userProfile.value = UserProfile(sessionCurrent!.username.value);
+    accountId.value = currentAccountId;
+    userProfile.value = UserProfile(session.username.value);
 
-    injectAutoCompleteBindings(sessionCurrent, accountId.value);
-    injectRuleFilterBindings(sessionCurrent, accountId.value);
-    injectVacationBindings(sessionCurrent, accountId.value);
-    injectFCMBindings(sessionCurrent, accountId.value);
+    injectAutoCompleteBindings(session, currentAccountId);
+    injectRuleFilterBindings(session, currentAccountId);
+    injectVacationBindings(session, currentAccountId);
+    injectFCMBindings(session, currentAccountId);
 
     _getVacationResponse();
     spamReportController.getSpamReportStateAction();
 
     if (PlatformInfo.isMobile) {
       getAllSendingEmails();
-      _storeSessionAction(sessionCurrent!);
+      _storeSessionAction(session);
     }
   }