[0015] Auth fix 3