added username and password fields