Added timezone to User, fixed some issues