Added username and password fields