diff --git a/handler/event.go b/handler/event.go
index 4d2e212..f01ca65 100644
--- a/handler/event.go
+++ b/handler/event.go
@@ -8,7 +8,6 @@ import (
 	"github.com/hashicorp/go-set"
 	"github.com/labstack/echo/v4"
 	"net/http"
-	"strconv"
 )
 
 func (h *Handler) CreateEvent(c echo.Context) (err error) {
@@ -91,7 +90,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 := strconv.Atoi(c.Request().Header.Get("UserOrganizationId"))
+	orgId, err := uuid.Parse(c.Request().Header.Get("UserOrganizationId"))
 
 	if err != nil {
 		return c.NoContent(http.StatusUnauthorized)
@@ -120,7 +119,7 @@ func (h *Handler) GetEvent(c echo.Context) error {
 
 func (h *Handler) DeleteEvent(c echo.Context) error {
 	id := c.Param("id")
-	orgId, err := strconv.Atoi(c.Request().Header.Get("UserOrganizationId"))
+	orgId, err := uuid.Parse(c.Request().Header.Get("UserOrganizationId"))
 
 	if err != nil {
 		return c.NoContent(http.StatusUnauthorized)
diff --git a/model/event.go b/model/event.go
index cae6d13..2c4de63 100644
--- a/model/event.go
+++ b/model/event.go
@@ -8,8 +8,8 @@ import (
 )
 
 type Event struct {
-	ID uuid.UUID `gorm:"type:uuid;default:gen_random_uuid();primarykey"`
 	gorm.Model
+	ID            uuid.UUID     `gorm:"type:uuid;default:gen_random_uuid();primarykey"`
 	Start         time.Time     `json:"start"`
 	End           time.Time     `json:"end"`
 	Author        User          `json:"author" gorm:"-"`