Removed username field since we generate that on the fly