diff --git a/api/js/etemplate/etemplate2.ts b/api/js/etemplate/etemplate2.ts
index d1aee309d2..8ade7f52cf 100644
--- a/api/js/etemplate/etemplate2.ts
+++ b/api/js/etemplate/etemplate2.ts
@@ -985,7 +985,7 @@ export class etemplate2
 		_root.iterateOver(function (_widget)
 		{
 			// The widget must have an id to be included in the values array
-			if (_widget.id == "") {
+			if (_widget.id === undefined || _widget.id === "") {
 				return;
 			}
 
diff --git a/calendar/js/app.ts b/calendar/js/app.ts
index a4195c3feb..25538f0cbe 100644
--- a/calendar/js/app.ts
+++ b/calendar/js/app.ts
@@ -630,10 +630,8 @@ export class CalendarApp extends EgwApp
 		let filtered = Object.keys(this._grants).filter(account => this.state.owner.indexOf(account) >= 0);
 
 		// Check if we're interested in displaying by owner / participant
-		let owner_check = et2_calendar_event.owner_check(cal_event, jQuery.extend({},
-            {options: {owner: filtered}},
-			this.et2
-		));
+		let owner_check = et2_calendar_event.owner_check(cal_event, this.et2, jQuery.extend({},
+            {options: {owner: filtered}}));
 		if(!owner_check)
 		{
 			// The owner is not in the list of what we're allowed / care about