User login stuff

All 8 tests pass, but please double check!!