fixup state of cp,login,logout after further investigation