implement new signup form validation
fix merge cflct