BISERVER-8750 Update the default user role creation logic