Fix user sign in / out process