Removed username field temporarily