Fixes #1608 - Update the registration/sign-in process in line with Jeff'...

...s latest feedback. For #1608.