remove username field
improve timezone handling