diff --git a/internal/api/members/controler.go b/internal/api/members/controler.go
index 40cba097..a6ed8ca3 100644
--- a/internal/api/members/controler.go
+++ b/internal/api/members/controler.go
@@ -65,7 +65,10 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	session, err := h.sessions.Create(data.ID, *data.MemberProfile)
+	// TODO: Refactor.
+	// data.ID
+
+	session, err := h.sessions.Create(*data.MemberProfile)
 	if err != nil {
 		utils.HttpInternalServerError(w, err)
 		return
diff --git a/internal/api/session.go b/internal/api/session.go
index d8792b12..446843d8 100644
--- a/internal/api/session.go
+++ b/internal/api/session.go
@@ -30,10 +30,8 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	token := data.Secret
-
 	// TODO: Proper login.
-	session, err := api.sessions.Create(token, types.MemberProfile{
+	session, err := api.sessions.Create(types.MemberProfile{
 		Name:               data.ID,
 		IsAdmin:            true,
 		CanLogin:           true,
@@ -55,7 +53,7 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) {
 
 	http.SetCookie(w, &http.Cookie{
 		Name:     "NEKO_SESSION",
-		Value:    token,
+		Value:    session.ID(),
 		Expires:  CookieExpirationDate,
 		Secure:   !UnsecureCookies,
 		SameSite: sameSite,
diff --git a/internal/session/manager.go b/internal/session/manager.go
index 2a4120b8..66ebf2eb 100644
--- a/internal/session/manager.go
+++ b/internal/session/manager.go
@@ -35,9 +35,13 @@ type SessionManagerCtx struct {
 	emmiter    events.EventEmmiter
 }
 
-func (manager *SessionManagerCtx) Create(id string, profile types.MemberProfile) (types.Session, error) {
-	manager.sessionsMu.Lock()
+func (manager *SessionManagerCtx) Create(profile types.MemberProfile) (types.Session, error) {
+	id, err := utils.NewUID(32)
+	if err != nil {
+		return nil, err
+	}
 
+	manager.sessionsMu.Lock()
 	_, ok := manager.sessions[id]
 	if ok {
 		manager.sessionsMu.Unlock()
diff --git a/internal/types/session.go b/internal/types/session.go
index 54328f71..bea5acef 100644
--- a/internal/types/session.go
+++ b/internal/types/session.go
@@ -59,7 +59,7 @@ type Session interface {
 }
 
 type SessionManager interface {
-	Create(id string, profile MemberProfile) (Session, error)
+	Create(profile MemberProfile) (Session, error)
 	Update(id string, profile MemberProfile) error
 	Get(id string) (Session, bool)
 	Delete(id string) error