Changes to login / signup logic