User auth fix, Defect add fix