Recruitment error fixing

This fixes a few minor bugs in the new pull from today and some discovered during my testing of the form with various inputs. Also cleans up some unnecessary code.
I like this approach of handling 2nd time signups.