Signup form issues fixes

Please check [\#19543@worklist](https://worklist.net/19543) for more information