diff --git a/pages/event-types/[type].tsx b/pages/event-types/[type].tsx
index e1de2c8550..79a9b21c8b 100644
--- a/pages/event-types/[type].tsx
+++ b/pages/event-types/[type].tsx
@@ -1062,15 +1062,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
 
   const eventType = await prisma.eventType.findFirst({
     where: {
-      userId: user.id,
-      OR: [
-        {
-          slug: typeParam,
-        },
-        {
-          id: parseInt(typeParam),
-        },
-      ],
+      AND: [{ userId: user.id }, { slug: typeParam }],
     },
     select: {
       id: true,
@@ -1090,7 +1082,6 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
       periodEndDate: true,
       periodCountCalendarDays: true,
       requiresConfirmation: true,
-      userId: true,
     },
   });
 
@@ -1100,12 +1091,6 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
     };
   }
 
-  if (eventType.userId != session.user.id) {
-    return {
-      notFound: true,
-    } as const;
-  }
-
   const credentials = await prisma.credential.findMany({
     where: {
       userId: user.id,
diff --git a/pages/event-types/index.tsx b/pages/event-types/index.tsx
index 2dde812bc9..f4aa4e0b1a 100644
--- a/pages/event-types/index.tsx
+++ b/pages/event-types/index.tsx
@@ -36,7 +36,7 @@ const EventTypesPage = (props: inferSSRProps<typeof getServerSideProps>) => {
   const router = useRouter();
   const createMutation = useMutation(createEventType, {
     onSuccess: async ({ eventType }) => {
-      await router.push("/event-types/" + eventType.id);
+      await router.push("/event-types/" + eventType.slug);
       showToast(`${eventType.title} event type created successfully`, "success");
     },
     onError: (err: Error) => {
@@ -223,7 +223,7 @@ const EventTypesPage = (props: inferSSRProps<typeof getServerSideProps>) => {
                   className={classNames("hover:bg-neutral-50", item.$disabled && "pointer-events-none")}
                   tabIndex={item.$disabled ? -1 : undefined}>
                   <div className={"flex items-center px-4 py-4 sm:px-6"}>
-                    <Link href={"/event-types/" + item.id}>
+                    <Link href={"/event-types/" + item.slug}>
                       <a className="flex-1 min-w-0 sm:flex sm:items-center sm:justify-between hover:bg-neutral-50">
                         <span className="truncate">
                           <div className="flex text-sm">