Refine signup procedure