diff --git a/apps/mail/components/connection/add.tsx b/apps/mail/components/connection/add.tsx
index ebe9bca7b..da242e08b 100644
--- a/apps/mail/components/connection/add.tsx
+++ b/apps/mail/components/connection/add.tsx
@@ -12,8 +12,8 @@ import { authClient } from '@/lib/auth-client';
 import { Plus, UserPlus } from 'lucide-react';
 import { useLocation } from 'react-router';
 import { useTranslations } from 'use-intl';
-import { Button } from '../ui/button';
 import { motion } from 'motion/react';
+import { Button } from '../ui/button';
 import { cn } from '@/lib/utils';
 import { useMemo } from 'react';
 import { toast } from 'sonner';
diff --git a/apps/mail/components/mail/mail-list.tsx b/apps/mail/components/mail/mail-list.tsx
index 29d6fc20f..fd827db7b 100644
--- a/apps/mail/components/mail/mail-list.tsx
+++ b/apps/mail/components/mail/mail-list.tsx
@@ -892,8 +892,8 @@ export const MailList = memo(
                     if (!vListRef.current) return;
                     const endIndex = vListRef.current.findEndIndex();
                     if (
-                      // if the shown items are last 2 items, load more
-                      Math.abs(filteredItems.length - 1 - endIndex) < 1 &&
+                      // if the shown items are last 5 items, load more
+                      Math.abs(filteredItems.length - 1 - endIndex) < 5 &&
                       !isLoading &&
                       !isFetchingNextPage &&
                       !isFetchingMail &&
diff --git a/apps/mail/components/navigation.tsx b/apps/mail/components/navigation.tsx
index a693f1e3c..c1e5b133f 100644
--- a/apps/mail/components/navigation.tsx
+++ b/apps/mail/components/navigation.tsx
@@ -82,7 +82,7 @@ export function Navigation() {
   return (
     <>
       {/* Desktop Navigation - Hidden on mobile */}
-      <header className="fixed z-50 hidden w-full items-center justify-center px-4 pt-6 md:flex max-w-3xl translate-x-[-50%] left-[50%]">
+      <header className="fixed left-[50%] z-50 hidden w-full max-w-3xl translate-x-[-50%] items-center justify-center px-4 pt-6 md:flex">
         <nav className="border-input/50 flex w-full max-w-3xl items-center justify-between gap-2 rounded-xl border-t bg-[#1E1E1E] p-2 px-4">
           <div className="flex items-center gap-6">
             <Link to="/" className="relative bottom-1 cursor-pointer">
diff --git a/apps/server/src/lib/auth-providers.ts b/apps/server/src/lib/auth-providers.ts
index c7772164d..e4623317e 100644
--- a/apps/server/src/lib/auth-providers.ts
+++ b/apps/server/src/lib/auth-providers.ts
@@ -72,7 +72,7 @@ export const authProviders = (env: Record<string, string>): ProviderConfig[] =>
       loginHint: 'email',
       disableProfilePhoto: true,
     },
-    required: true,
+    required: false,
   },
 ];
 
diff --git a/packages/cli/src/commands/fix-env.ts b/packages/cli/src/commands/fix-env.ts
index 9457d4046..8931c7aff 100644
--- a/packages/cli/src/commands/fix-env.ts
+++ b/packages/cli/src/commands/fix-env.ts
@@ -4,7 +4,12 @@ import { readFile, writeFile } from 'fs/promises';
 import type { Command } from '.';
 import { join } from 'path';
 
-const requiredManualVariables = ['GOOGLE_CLIENT_ID', 'GOOGLE_CLIENT_SECRET'];
+const requiredManualVariables = [
+  'GOOGLE_CLIENT_ID',
+  'GOOGLE_CLIENT_SECRET',
+  'MICROSOFT_CLIENT_ID',
+  'MICROSOFT_CLIENT_SECRET',
+];
 
 export const command: Command = {
   id: 'env',