Apply Sign In / Sign Out fix