Login Fix
Revert "Login Fix"

This reverts commit 54daeb61fe034874dc6dd6742dc1ab496aeba257.
Updated a few changes