Consolidate login and add username and password fields