Rest of final fixes to signup process