Added username and password fields to user