Updated Signup form to be more flexible