diff --git a/auth/session.go b/auth/session.go
index ae064fe8..93075857 100644
--- a/auth/session.go
+++ b/auth/session.go
@@ -78,8 +78,8 @@ func (h *Handler) createSession(c echo.Context, user *User) error {
 	}
 
 	session, err := h.db.CreateSession(ctx, dbc.CreateSessionParams{
-		ID:     base64.StdEncoding.EncodeToString(id),
-		UserID: user.ID,
+		Token:  base64.StdEncoding.EncodeToString(id),
+		UserID: user.Id,
 		Device: device,
 	})
 	if err != nil {
diff --git a/auth/sql/migrations/000003_sessions.up.sql b/auth/sql/migrations/000003_sessions.up.sql
index aae74520..f9383ed9 100644
--- a/auth/sql/migrations/000003_sessions.up.sql
+++ b/auth/sql/migrations/000003_sessions.up.sql
@@ -1,7 +1,8 @@
 begin;
 
 create table sessions(
-	id varchar(128) not null primary key,
+	id uuid not null primary key,
+	token varchar(128) not null unique,
 	user_id uuid not null references users(id) on delete cascade,
 	created_date timestamptz not null default now()::timestamptz,
 	last_used timestamptz not null default now()::timestamptz,