User cert tweaks (handling nulls)