Update account setup controller to support new server side spec