Proper sign out support