Moved form fields to SSPs