Fixed signup issues
fixed the signup issues
merge