Fix the double login issue