#634 - Only allow editing SystemProperty, add validation against type