Cleaning up signin / signout url handling