Got rid of login form, reconstructed login