refactor signup forms