BISERVER-8750 - Update the logic for creating default user and roles