More credentials tweaks