Revert "Revert "Revert "Fixed login"""

This reverts commit fb0f5c3d954279e9de197fb1a1b78a628ab7cafd.