Added on join checks for all the settings