Fix #124 and a few more oddities encountered on the signup process