Improve sign up page logic