More changes to properly implement opacuserlogin preference.