temporary fix for after-sign-in to make it work better