diff --git a/store/models.go b/store/models.go
index 9888ccc..b697043 100644
--- a/store/models.go
+++ b/store/models.go
@@ -9,21 +9,21 @@ import (
 type UserStatus string
 
 const (
-	StatusActive          UserStatus = "active"
-	StatusDeactivated     UserStatus = "deactivated"
-	StatusLocked          UserStatus = "locked"
-	StatusBanned          UserStatus = "banned"
-	StatusPendingDeletion UserStatus = "pending_deletion"
+	UserStatusActive          UserStatus = "active"
+	UserStatusDeactivated     UserStatus = "deactivated"
+	UserStatusLocked          UserStatus = "locked"
+	UserStatusBanned          UserStatus = "banned"
+	UserStatusPendingDeletion UserStatus = "pending_deletion"
 )
 
 type User struct {
 	ID                 string
 	Email              string
 	EmailVerifiedAt    NullTime
-	Username           string
-	UsernameNormalized string
-	DisplayName        string
-	ProfileImageURL    string
+	Username           NullString
+	UsernameNormalized NullString
+	DisplayName        NullString
+	ProfileImageURL    NullString
 
 	Status          UserStatus
 	StatusReason    string
@@ -99,7 +99,7 @@ type Token struct {
 	HashedValue string
 	Payload     JSONB
 	ExpiresAt   time.Time
-	ConsumedAt  time.Time
+	ConsumedAt  NullTime
 	CreatedAt   time.Time
 }