Various fixes
Merge pull request #384 from owdqa/bugfix/Contacts_Settings

Various fixes