#14 cleanup login