diff --git a/frontend/src/view/editCalendarView.vue b/frontend/src/view/editCalendarView.vue
index fa2bfad..838fe93 100644
--- a/frontend/src/view/editCalendarView.vue
+++ b/frontend/src/view/editCalendarView.vue
@@ -13,7 +13,7 @@ const modules: Ref<Module[]> = ref(moduleStore().modules);
 
 function extractToken(token: string): string {
   const tokenRegex = /^[a-z0-9]{15}$/;
-  const tokenUriRegex = /\?token=([a-z0-9]{15})(?:&|$)/;
+  const tokenUriRegex = /(?:\?|&)token=([a-z0-9]{15})(?:&|$)/;
 
   if (tokenRegex.test(token)) {
     return token;