Fix signin and signout