diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index 9a135df..db920a2 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -18,7 +18,18 @@ export const config = {
   },
   
   cors: {
-    origin: process.env.CORS_ORIGIN?.split(',') || ['http://localhost:3000'],
+    origin: (() => {
+      const envOrigins = process.env.CORS_ORIGIN?.split(',').map((o) => o.trim()).filter(Boolean);
+      const defaults = ['http://localhost:3000', 'http://localhost:5173'];
+      const origins = envOrigins?.length ? envOrigins : defaults;
+      // In development, always allow both common dev server origins
+      if (process.env.NODE_ENV !== 'production') {
+        ['http://localhost:3000', 'http://localhost:5173'].forEach((o) => {
+          if (!origins.includes(o)) origins.push(o);
+        });
+      }
+      return origins;
+    })(),
   },
   
   upload: {
diff --git a/backend/src/modules/auth/auth.routes.ts b/backend/src/modules/auth/auth.routes.ts
index 1279142..4737f48 100644
--- a/backend/src/modules/auth/auth.routes.ts
+++ b/backend/src/modules/auth/auth.routes.ts
@@ -30,7 +30,7 @@ router.post(
 router.post(
   '/login',
   [
-    body('email').isEmail().withMessage('البريد الإلكتروني غير صالح'),
+    body('email').trim().notEmpty().withMessage('البريد الإلكتروني أو اسم المستخدم مطلوب'),
     body('password').notEmpty().withMessage('كلمة المرور مطلوبة'),
   ],
   validate,
diff --git a/frontend/public/favicon.ico b/frontend/public/favicon.ico
new file mode 100644
index 0000000..3239bf6
Binary files /dev/null and b/frontend/public/favicon.ico differ
diff --git a/frontend/src/app/icon.png b/frontend/src/app/icon.png
deleted file mode 100644
index e69de29..0000000
diff --git a/frontend/src/app/layout.tsx b/frontend/src/app/layout.tsx
index 83258dc..63454f3 100644
--- a/frontend/src/app/layout.tsx
+++ b/frontend/src/app/layout.tsx
@@ -21,6 +21,9 @@ const readexPro = Readex_Pro({
 export const metadata: Metadata = {
   title: 'ATMATA - نظام إدارة علاقات العملاء',
   description: 'Enterprise CRM System for Contact Management, Sales, HR, Inventory, Projects, and Marketing',
+  icons: {
+    icon: '/favicon.ico',
+  },
 }
 
 export default function RootLayout({
diff --git a/frontend/src/app/login/page.tsx b/frontend/src/app/login/page.tsx
index 588a316..ff138fe 100644
--- a/frontend/src/app/login/page.tsx
+++ b/frontend/src/app/login/page.tsx
@@ -7,7 +7,7 @@ import { LogIn, Mail, Lock, Building2, AlertCircle } from 'lucide-react'
 
 export default function LoginPage() {
   const { login } = useAuth()
-  const [email, setEmail] = useState('')
+  const [emailOrUsername, setEmailOrUsername] = useState('')
   const [password, setPassword] = useState('')
   const [error, setError] = useState('')
   const [isLoading, setIsLoading] = useState(false)
@@ -18,7 +18,7 @@ export default function LoginPage() {
     setIsLoading(true)
 
     try {
-      await login(email, password)
+      await login(emailOrUsername, password)
     } catch (err: any) {
       setError(err.message || 'فشل تسجيل الدخول. الرجاء المحاولة مرة أخرى.')
     } finally {
@@ -50,20 +50,21 @@ export default function LoginPage() {
           )}
 
           <form onSubmit={handleSubmit} className="space-y-6">
-            {/* Email Field */}
+            {/* Email or Username Field */}
             <div>
-              <label htmlFor="email" className="block text-sm font-semibold text-gray-700 mb-2">
-                البريد الإلكتروني
+              <label htmlFor="emailOrUsername" className="block text-sm font-semibold text-gray-700 mb-2">
+                البريد الإلكتروني أو اسم المستخدم
               </label>
               <div className="relative">
                 <Mail className="absolute left-3 top-1/2 transform -translate-y-1/2 h-5 w-5 text-gray-400" />
                 <input
-                  id="email"
-                  type="email"
-                  value={email}
-                  onChange={(e) => setEmail(e.target.value)}
+                  id="emailOrUsername"
+                  type="text"
+                  value={emailOrUsername}
+                  onChange={(e) => setEmailOrUsername(e.target.value)}
                   required
-                  placeholder="example@atmata.com"
+                  placeholder="admin أو example@atmata.com"
+                  autoComplete="username"
                   className="w-full pl-10 pr-4 py-3 border border-gray-300 rounded-lg focus:ring-2 focus:ring-primary-500 focus:border-transparent transition-all"
                   disabled={isLoading}
                 />