Updated for user signup and signin