Fixes authentication.
Merged?