[PreferencesModel] Missing removeScope, incorrect user state path

@dangoor 

Merge with master