Fixed functionality issues for login and signup, not tested