diff --git a/database/upgrades/2022-05-11-add-user-timestamp.go b/database/upgrades/2022-05-11-add-user-timezone.go
similarity index 100%
rename from database/upgrades/2022-05-11-add-user-timestamp.go
rename to database/upgrades/2022-05-11-add-user-timezone.go
diff --git a/database/user.go b/database/user.go
index a01a0a2..cd43acc 100644
--- a/database/user.go
+++ b/database/user.go
@@ -90,16 +90,17 @@ type User struct {
 }
 
 func (user *User) Scan(row Scannable) *User {
-	var username sql.NullString
+	var username, timezone sql.NullString
 	var device, agent sql.NullByte
 	var phoneLastSeen, phoneLastPinged sql.NullInt64
-	err := row.Scan(&user.MXID, &username, &agent, &device, &user.ManagementRoom, &user.SpaceRoom, &phoneLastSeen, &phoneLastPinged, &user.Timezone)
+	err := row.Scan(&user.MXID, &username, &agent, &device, &user.ManagementRoom, &user.SpaceRoom, &phoneLastSeen, &phoneLastPinged, &timezone)
 	if err != nil {
 		if err != sql.ErrNoRows {
 			user.log.Errorln("Database scan failed:", err)
 		}
 		return nil
 	}
+	user.Timezone = timezone.String
 	if len(username.String) > 0 {
 		user.JID = types.NewADJID(username.String, agent.Byte, device.Byte)
 	}