Improving sign up logic