Merge "Fix for SettingsProvider to query for correct user."