Fixed a few login issues