Fix authorization/authentication merge, fixes #1684