ticket:5 some settings fix