#JC-1604 Login clearing bug