Almost done fixing login