Fix up user profile
Fixing settings tests
Merge pull request #3882 from JohnONolan/fix-profile

Fix up user profile