Moving form logic out of services controller