diff --git a/handler/event.go b/handler/event.go
index 2077293..c6b3b58 100644
--- a/handler/event.go
+++ b/handler/event.go
@@ -19,8 +19,8 @@ import (
 func (h *Handler) CreateEvent(c echo.Context) (err error) {
 	var person *model.PersonalInformationApi
 	event := new(model.CreateEvent)
-	authorId, err := uuid.Parse(c.Request().Header.Get("UserId"))
-	orgId, err := uuid.Parse(c.Request().Header.Get("UserOrganizationId"))
+	authorId, err := uuid.Parse(c.Request().Header.Get("X-User-Id"))
+	orgId, err := uuid.Parse(c.Request().Header.Get("X-User-Organization-Id"))
 	if err != nil {
 		return c.NoContent(http.StatusUnauthorized)
 	}
@@ -94,7 +94,7 @@ func (h *Handler) GetEvents(c echo.Context) (err error) {
 	var events []model.Event
 	query := c.Request().URL.Query()
 	_, _, filterMap := utils.GetFilterParams(query)
-	orgId, err := uuid.Parse(c.Request().Header.Get("UserOrganizationId"))
+	orgId, err := uuid.Parse(c.Request().Header.Get("X-User-Organization-Id"))
 
 	if err != nil {
 		return c.NoContent(http.StatusUnauthorized)
@@ -140,7 +140,7 @@ func (h *Handler) GetEvents(c echo.Context) (err error) {
 func (h *Handler) GetEvent(c echo.Context) error {
 	var event model.Event
 	id := c.Param("id")
-	orgId, err := uuid.Parse(c.Request().Header.Get("UserOrganizationId"))
+	orgId, err := uuid.Parse(c.Request().Header.Get("X-User-Organization-Id"))
 
 	if err != nil {
 		return c.NoContent(http.StatusUnauthorized)
@@ -174,7 +174,7 @@ func (h *Handler) GetEvent(c echo.Context) error {
 
 func (h *Handler) DeleteEvent(c echo.Context) error {
 	id := c.Param("id")
-	orgId, err := uuid.Parse(c.Request().Header.Get("UserOrganizationId"))
+	orgId, err := uuid.Parse(c.Request().Header.Get("X-User-Organization-Id"))
 
 	if err != nil {
 		return c.NoContent(http.StatusUnauthorized)