Fixed User authentication merge errors