diff --git a/src/components/Calendar/Calendar.tsx b/src/components/Calendar/Calendar.tsx
index 58ceea2..58d0c66 100644
--- a/src/components/Calendar/Calendar.tsx
+++ b/src/components/Calendar/Calendar.tsx
@@ -56,7 +56,7 @@ export default function CalendarApp() {
 
   const calendars = useAppSelector((state) => state.calendars.list);
   const pending = useAppSelector((state) => state.calendars.pending);
-  const userId = useAppSelector((state) => state.user.userData.openpaasId);
+  const userId = useAppSelector((state) => state.user.userData?.openpaasId) ?? "";
   const selectPersonnalCalendars = createSelector(
     (state) => state.calendars,
     (calendars) =>
diff --git a/src/components/Calendar/CalendarSelection.tsx b/src/components/Calendar/CalendarSelection.tsx
index 68b12f7..4d78dae 100644
--- a/src/components/Calendar/CalendarSelection.tsx
+++ b/src/components/Calendar/CalendarSelection.tsx
@@ -10,7 +10,6 @@ import { Calendars } from "../../features/Calendars/CalendarTypes";
 import MoreVertIcon from "@mui/icons-material/MoreVert";
 import IconButton from "@mui/material/IconButton";
 import Checkbox from "@mui/material/Checkbox";
-import Button from "@mui/material/Button";
 import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
 
 function CalendarAccordion({
@@ -81,7 +80,7 @@ export default function CalendarSelection({
   selectedCalendars: string[];
   setSelectedCalendars: Function;
 }) {
-  const userId = useAppSelector((state) => state.user.userData.openpaasId);
+  const userId = useAppSelector((state) => state.user.userData?.openpaasId) ?? "";
   const calendars = useAppSelector((state) => state.calendars.list);
 
   const personnalCalendars = Object.keys(calendars).filter(
diff --git a/src/features/Calendars/CalendarModal.tsx b/src/features/Calendars/CalendarModal.tsx
index 623716b..d53c3c1 100644
--- a/src/features/Calendars/CalendarModal.tsx
+++ b/src/features/Calendars/CalendarModal.tsx
@@ -30,7 +30,7 @@ function CalendarPopover({
 }) {
   const dispatch = useAppDispatch();
   const userId =
-    useAppSelector((state) => state.user.userData.openpaasId) ?? "";
+    useAppSelector((state) => state.user.userData?.openpaasId) ?? "";
   const [name, setName] = useState(calendar?.name ?? "");
   const [description, setDescription] = useState(calendar?.description ?? "");
   const [color, setColor] = useState(calendar?.color ?? "");
diff --git a/src/features/Events/EventDisplay.tsx b/src/features/Events/EventDisplay.tsx
index 5bc56ab..0c51855 100644
--- a/src/features/Events/EventDisplay.tsx
+++ b/src/features/Events/EventDisplay.tsx
@@ -74,7 +74,7 @@ export default function EventDisplayModal({
   );
 
   const userPersonnalCalendars: Calendars[] = calendars.filter(
-    (c) => c.id?.split("/")[0] === user.userData.openpaasId
+    (c) => c.id?.split("/")[0] === user.userData?.openpaasId
   );
 
   // Form state
@@ -97,7 +97,7 @@ export default function EventDisplayModal({
   const [timezone, setTimezone] = useState(event?.timezone ?? "UTC");
   const [newCalId, setNewCalId] = useState(event?.calId);
   const [calendarid, setCalendarid] = useState(
-    calId.split("/")[0] === user.userData.openpaasId
+    calId.split("/")[0] === user.userData?.openpaasId
       ? userPersonnalCalendars.findIndex((cal) => cal.id === calId)
       : calendars.findIndex((cal) => cal.id === calId)
   );
@@ -198,7 +198,7 @@ export default function EventDisplayModal({
   };
 
   const calList =
-    calId.split("/")[0] === user.userData.openpaasId
+    calId.split("/")[0] === user.userData?.openpaasId
       ? Object.keys(userPersonnalCalendars).map((calendar, index) => (
           <MenuItem key={index} value={index}>
             <Typography variant="body2">
diff --git a/src/features/Events/EventModal.tsx b/src/features/Events/EventModal.tsx
index 92aa3ae..2bc80ed 100644
--- a/src/features/Events/EventModal.tsx
+++ b/src/features/Events/EventModal.tsx
@@ -46,7 +46,7 @@ function EventPopover({
   const dispatch = useAppDispatch();
 
   const organizer = useAppSelector((state) => state.user.organiserData);
-  const userId = useAppSelector((state) => state.user.userData.openpaasId);
+  const userId = useAppSelector((state) => state.user.userData?.openpaasId) ?? "";
   const selectPersonnalCalendars = createSelector(
     (state) => state.calendars,
     (calendars) =>