diff --git a/internal/api/members/controler.go b/internal/api/members/controler.go
index 1a6d5a4f..73fcea0e 100644
--- a/internal/api/members/controler.go
+++ b/internal/api/members/controler.go
@@ -65,10 +65,7 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	// TODO: Refactor.
-	// data.ID
-
-	session, _, err := h.sessions.Create(*data.MemberProfile)
+	session, _, err := h.sessions.Create(data.ID, *data.MemberProfile)
 	if err != nil {
 		utils.HttpInternalServerError(w, err)
 		return
diff --git a/internal/api/session.go b/internal/api/session.go
index 69761ba0..87f66d31 100644
--- a/internal/api/session.go
+++ b/internal/api/session.go
@@ -31,7 +31,7 @@ func (api *ApiManagerCtx) Login(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// TODO: Proper login.
-	session, token, err := api.sessions.Create(types.MemberProfile{
+	session, token, err := api.sessions.Create(data.ID, types.MemberProfile{
 		Name:               data.ID,
 		IsAdmin:            true,
 		CanLogin:           true,
diff --git a/internal/session/manager.go b/internal/session/manager.go
index 26f9ed1a..2a7c4a73 100644
--- a/internal/session/manager.go
+++ b/internal/session/manager.go
@@ -37,12 +37,7 @@ type SessionManagerCtx struct {
 	emmiter    events.EventEmmiter
 }
 
-func (manager *SessionManagerCtx) Create(profile types.MemberProfile) (types.Session, string, error) {
-	id, err := utils.NewUID(32)
-	if err != nil {
-		return nil, "", err
-	}
-
+func (manager *SessionManagerCtx) Create(id string, profile types.MemberProfile) (types.Session, string, error) {
 	token, err := utils.NewUID(64)
 	if err != nil {
 		return nil, "", err
diff --git a/internal/types/session.go b/internal/types/session.go
index 443ed042..b60b3696 100644
--- a/internal/types/session.go
+++ b/internal/types/session.go
@@ -59,11 +59,11 @@ type Session interface {
 }
 
 type SessionManager interface {
-	Create(profile MemberProfile) (Session, string, error)
+	Create(id string, profile MemberProfile) (Session, string, error)
 	Update(id string, profile MemberProfile) error
 	Delete(id string) error
 	Get(id string) (Session, bool)
-	GetByToken(token string) (Session, bool) 
+	GetByToken(token string) (Session, bool)
 	List() []Session
 
 	SetHost(host Session)