TRUNK-4495 Settings page returns 500