[0013] Authentication fix 2