SignUp tweaks
Revert "SignUp tweaks"

This reverts commit 6ac1cf7f1e98dcb01e9d32e1be3c6f204a5a540f.