Fixes #5086: Addd Authentication API