diff --git a/blueprints/community/calendar/routes.py b/blueprints/community/calendar/routes.py
index 6102786..da2c968 100644
--- a/blueprints/community/calendar/routes.py
+++ b/blueprints/community/calendar/routes.py
@@ -32,7 +32,7 @@ def index():
         today = date.today()
 
         # Parametry widoku
-        view_mode = request.args.get('view', 'list')  # list lub grid
+        view_mode = request.args.get('view', 'cards')  # cards, list lub grid
         year = request.args.get('year', today.year, type=int)
         month = request.args.get('month', today.month, type=int)
 
@@ -532,14 +532,18 @@ def delete_guest(event_id, guest_id):
 @login_required
 def company_colleagues(event_id):
     """Pobierz listę kolegów z firmy do dropdownu przy dodawaniu gościa"""
-    if not current_user.company_id:
+    from helpers.company_context import get_active_company_id
+    active_cid = get_active_company_id()
+    if not active_cid:
         return jsonify([])
 
     db = SessionLocal()
     try:
-        from database import User
-        colleagues = db.query(User).filter(
-            User.company_id == current_user.company_id,
+        from database import User, UserCompany
+        colleagues = db.query(User).join(
+            UserCompany, UserCompany.user_id == User.id
+        ).filter(
+            UserCompany.company_id == active_cid,
             User.id != current_user.id,
             User.is_active == True
         ).order_by(User.name).all()
diff --git a/templates/calendar/event.html b/templates/calendar/event.html
index e79aad2..d1f3238 100755
--- a/templates/calendar/event.html
+++ b/templates/calendar/event.html
@@ -922,7 +922,7 @@ function onColleagueSelect() {
         const c = JSON.parse(select.value);
         document.getElementById('guest-first-name').value = c.first_name || '';
         document.getElementById('guest-last-name').value = c.last_name || '';
-        document.getElementById('guest-org').value = '{{ current_user.company.name|default("", true)|e }}';
+        document.getElementById('guest-org').value = '{{ active_company.name|default(current_user.company.name|default("", true), true)|e }}';
     } catch(e) {}
 }