Improve signup & signin