diff --git a/app/Filament/Pages/Auth/EditProfile.php b/app/Filament/Pages/Auth/EditProfile.php
index 107a520a0..1b0da3890 100644
--- a/app/Filament/Pages/Auth/EditProfile.php
+++ b/app/Filament/Pages/Auth/EditProfile.php
@@ -261,7 +261,7 @@ class EditProfile extends BaseEditProfile
                                                 Action::make('Create')
                                                     ->label(trans('filament-actions::create.single.modal.actions.create.label'))
                                                     ->disabled(fn (Get $get) => $get('description') === null)
-                                                    ->successRedirectUrl(self::getUrl(['tab' => '-api-keys-tab']))
+                                                    ->successRedirectUrl(self::getUrl(['tab' => '-api-keys-tab'], panel: 'app'))
                                                     ->action(function (Get $get, Action $action, User $user) {
                                                         $token = $user->createToken(
                                                             $get('description'),
@@ -345,7 +345,7 @@ class EditProfile extends BaseEditProfile
             $tokens = $this->toggleTwoFactorService->handle($record, $token, true);
             cache()->put("users.$record->id.2fa.tokens", implode("\n", $tokens), now()->addSeconds(15));
 
-            $this->redirectRoute('filament.admin.auth.profile', ['tab' => '-2fa-tab']);
+            $this->redirect(self::getUrl(['tab' => '-2fa-tab'], panel: 'app'));
         }
 
         if ($token = $data['2fa-disable-code'] ?? null) {
diff --git a/app/Http/Controllers/Auth/OAuthController.php b/app/Http/Controllers/Auth/OAuthController.php
index c5ca51d3b..672b204b0 100644
--- a/app/Http/Controllers/Auth/OAuthController.php
+++ b/app/Http/Controllers/Auth/OAuthController.php
@@ -53,7 +53,7 @@ class OAuthController extends Controller
 
             $this->updateService->handle($request->user(), ['oauth' => $oauth]);
 
-            return redirect(EditProfile::getUrl(['tab' => '-oauth-tab']));
+            return redirect(EditProfile::getUrl(['tab' => '-oauth-tab'], panel: 'app'));
         }
 
         try {
diff --git a/app/Providers/Filament/AdminPanelProvider.php b/app/Providers/Filament/AdminPanelProvider.php
index edaf32766..b97f60016 100644
--- a/app/Providers/Filament/AdminPanelProvider.php
+++ b/app/Providers/Filament/AdminPanelProvider.php
@@ -38,9 +38,9 @@ class AdminPanelProvider extends PanelProvider
             ->favicon(config('app.favicon', '/pelican.ico'))
             ->topNavigation(config('panel.filament.top-navigation', true))
             ->maxContentWidth(config('panel.filament.display-width', 'screen-2xl'))
-            ->profile(EditProfile::class, false)
             ->login(Login::class)
             ->userMenuItems([
+                'profile' => MenuItem::make()->label(trans('filament-panels::pages/auth/edit-profile.label'))->url(fn () => EditProfile::getUrl(panel: 'app')),
                 MenuItem::make()
                     ->label(trans('profile.exit_admin'))
                     ->url('/')