diff --git a/apps/backend/src/application/gateways/notifications.gateway.ts b/apps/backend/src/application/gateways/notifications.gateway.ts
index 843d13c..d570372 100644
--- a/apps/backend/src/application/gateways/notifications.gateway.ts
+++ b/apps/backend/src/application/gateways/notifications.gateway.ts
@@ -25,7 +25,7 @@ import { Notification } from '../../domain/entities/notification.entity';
 @UseGuards()
 @WebSocketGateway({
   cors: {
-    origin: process.env.FRONTEND_URL || 'http://localhost:3000',
+    origin: process.env.FRONTEND_URL || ['http://localhost:3000', 'http://localhost:3001'],
     credentials: true,
   },
   namespace: '/notifications',
diff --git a/apps/backend/src/infrastructure/security/security.config.ts b/apps/backend/src/infrastructure/security/security.config.ts
index adb1ced..695e2f3 100644
--- a/apps/backend/src/infrastructure/security/security.config.ts
+++ b/apps/backend/src/infrastructure/security/security.config.ts
@@ -99,7 +99,7 @@ export const rateLimitConfig = {
  * CORS Configuration
  */
 export const corsConfig = {
-  origin: process.env.FRONTEND_URL || 'http://localhost:3000',
+  origin: process.env.FRONTEND_URL || ['http://localhost:3000', 'http://localhost:3001'],
   credentials: true,
   methods: ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'],
   allowedHeaders: [
diff --git a/apps/frontend/app/register/page.tsx b/apps/frontend/app/register/page.tsx
index 7ed98a1..18802a6 100644
--- a/apps/frontend/app/register/page.tsx
+++ b/apps/frontend/app/register/page.tsx
@@ -54,7 +54,7 @@ export default function RegisterPage() {
         password: formData.password,
         firstName: formData.firstName,
         lastName: formData.lastName,
-        organizationId: formData.organizationId || 'default-org-id', // TODO: Implement proper org selection
+        organizationId: "a1234567-0000-4000-8000-000000000001", // Test Organization (default for development)
       });
     } catch (err: any) {
       setError(