Signup logic improved, not perfect yet