Further tweaks to user signup