update to work with custom user model and timezone-aware datetimes