Split user add form for future