Make user sign out work a bit better