Sign-up mostly done, e-mail works - some odd patterns need resolving however