k3.1 fix cleanup login