Changes to get the user profile admin tool working.