diff --git a/templates/calendar/event.html b/templates/calendar/event.html
index d1f3238..a5e2c29 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 = '{{ active_company.name|default(current_user.company.name|default("", true), true)|e }}';
+ document.getElementById('guest-org').value = '{{ (active_company.name if active_company else (current_user.company.name if current_user.company else ""))|e }}';
} catch(e) {}
}