Fix User authentication + Feedback