Signin/signout fix