Revert "Revert "sign up issue fixing""

This reverts commit 55fd53f8ea5b72cd740e9dea329e677585bc7a91.