PLAT-6607 - Handle permissive user name

Make compatible with previous use of null