Fixing signups
Merging signup fix into master