Fix login bug
Fix other login bug