Bug: Incomplete fix for user specific settings.