WEBCMS-24 - Update configuration logic

WEBCMS-24 - Update configuration logic