Merge zdwolfe auth fix