diff --git a/src/components/pages/UserEditPage.tsx b/src/components/pages/UserEditPage.tsx
index 1d279711f2..757a203c00 100644
--- a/src/components/pages/UserEditPage.tsx
+++ b/src/components/pages/UserEditPage.tsx
@@ -239,7 +239,7 @@ const UserEditPage: FunctionComponent = () => {
                 user.Policy.SyncPlayAccess = (page.querySelector('#selectSyncPlayAccess') as HTMLInputElement).value as SyncPlayUserAccessType;
             }
             window.ApiClient.updateUser(user).then(function () {
-                window.ApiClient.updateUserPolicy(user.Id, user.Policy).then(function () {
+                window.ApiClient.updateUserPolicy(user.Id || '', user.Policy || {}).then(function () {
                     onSaveComplete();
                 });
             });
diff --git a/src/components/pages/UserParentalControl.tsx b/src/components/pages/UserParentalControl.tsx
index 07bac13a57..db0fe3b0b9 100644
--- a/src/components/pages/UserParentalControl.tsx
+++ b/src/components/pages/UserParentalControl.tsx
@@ -1,4 +1,4 @@
-import { AccessSchedule, UserDto } from '@thornbill/jellyfin-sdk/dist/generated-client';
+import { AccessSchedule, DynamicDayOfWeek, UserDto } from '@thornbill/jellyfin-sdk/dist/generated-client';
 import React, { FunctionComponent, useCallback, useEffect, useState, useRef } from 'react';
 import globalize from '../../scripts/globalize';
 import LibraryMenu from '../../scripts/libraryMenu';
@@ -300,7 +300,13 @@ const UserParentalControl: FunctionComponent = () => {
         };
 
         (page.querySelector('.btnAddSchedule') as HTMLButtonElement).addEventListener('click', function () {
-            showSchedulePopup({}, -1);
+            showSchedulePopup({
+                Id: 0,
+                UserId: '',
+                DayOfWeek: DynamicDayOfWeek.Sunday,
+                StartHour: 0,
+                EndHour: 0
+            }, -1);
         });
 
         (page.querySelector('.btnAddBlockedTag') as HTMLButtonElement).addEventListener('click', function () {