Changes to help implement Client edit forms. Stopping here to refactor 'permission' logic to 'role' for consistency.