Add general? to locations. Modify user permissions. Change edit user view