Bug 828479 - fix online support in Settings
Merge pull request #7447 from fabi1cazenave/settings-online-support

Bug 828479 - fix online support in Settings