Signup form issues fixes
Merge pull request #20 from kordero/19543

Signup form issues fixes