Improve sign-up prepopulating
Improve sign-up prepopulating (attempt 2)