Potential Fix for login bug