Improved sign-up - not yet tested still