Corrected User model and Account New Form