Fixed annoying account unlock issue