tweaks to avoid customer login bleeding