diff --git a/pkg/database/accounts.go b/pkg/database/accounts.go
index dcd7159..216cf64 100644
--- a/pkg/database/accounts.go
+++ b/pkg/database/accounts.go
@@ -115,7 +115,7 @@ func (db *DB) LoadAccountUsernames() (map[string]string, error) {
 	return accounts, nil
 }
 
-func (db *DB) LoadAccountById(id string) (*model.Account, error) {
+func (db *DB) LoadAccountById(id uuid.UUID) (*model.Account, error) {
 	account := model.Account{
 		Id: id,
 	}
diff --git a/pkg/database/states.go b/pkg/database/states.go
index e213d2c..61e5f88 100644
--- a/pkg/database/states.go
+++ b/pkg/database/states.go
@@ -12,7 +12,7 @@ import (
 	"go.n16f.net/uuid"
 )
 
-func (db *DB) CreateState(path string, accountId string, data []byte) (*model.Version, error) {
+func (db *DB) CreateState(path string, accountId uuid.UUID, data []byte) (*model.Version, error) {
 	encryptedData, err := db.dataEncryptionKey.EncryptAES256(data)
 	if err != nil {
 		return nil, fmt.Errorf("failed to encrypt state data: %w", err)
@@ -142,7 +142,7 @@ func (db *DB) LoadStates() ([]model.State, error) {
 }
 
 // returns true in case of lock mismatch
-func (db *DB) SetState(path string, accountId string, data []byte, lock string) (bool, error) {
+func (db *DB) SetState(path string, accountId uuid.UUID, data []byte, lock string) (bool, error) {
 	encryptedData, err := db.dataEncryptionKey.EncryptAES256(data)
 	if err != nil {
 		return false, fmt.Errorf("failed to encrypt state data: %w", err)
diff --git a/pkg/model/account.go b/pkg/model/account.go
index d47668a..41d7868 100644
--- a/pkg/model/account.go
+++ b/pkg/model/account.go
@@ -6,12 +6,13 @@ import (
 	"time"
 
 	"git.adyxax.org/adyxax/tfstated/pkg/helpers"
+	"go.n16f.net/uuid"
 )
 
 type AccountContextKey struct{}
 
 type Account struct {
-	Id           string
+	Id           uuid.UUID
 	Username     string
 	Salt         []byte
 	PasswordHash []byte
diff --git a/pkg/model/session.go b/pkg/model/session.go
index 8b2bb01..fa88693 100644
--- a/pkg/model/session.go
+++ b/pkg/model/session.go
@@ -2,13 +2,15 @@ package model
 
 import (
 	"time"
+
+	"go.n16f.net/uuid"
 )
 
 type SessionContextKey struct{}
 
 type Session struct {
 	Id        string
-	AccountId string
+	AccountId uuid.UUID
 	Created   time.Time
 	Updated   time.Time
 	Data      any
diff --git a/pkg/model/version.go b/pkg/model/version.go
index 1d15bd1..2a18d14 100644
--- a/pkg/model/version.go
+++ b/pkg/model/version.go
@@ -8,7 +8,7 @@ import (
 )
 
 type Version struct {
-	AccountId string
+	AccountId uuid.UUID
 	Created   time.Time
 	Data      json.RawMessage
 	Id        uuid.UUID
diff --git a/pkg/webui/html/statesId.html b/pkg/webui/html/statesId.html
index 3691bb6..7a1ae7f 100644
--- a/pkg/webui/html/statesId.html
+++ b/pkg/webui/html/statesId.html
@@ -20,7 +20,7 @@
     <tbody>
       {{ range .Versions }}
       <tr>
-        <td><a href="/versions/{{ .Id }}">{{ index $.Usernames .AccountId }}</a></td>
+        <td><a href="/versions/{{ .Id }}">{{ index $.Usernames .AccountId.String }}</a></td>
         <td><a href="/versions/{{ .Id }}">{{ .Created }}</a></td>
       </tr>
       {{ end }}