Merge "Fix settings crash on users page on config change"