source settings store mechanism updated
settings login updated
code reviewed and fixed