Fix builtin authentication issue caused by commit 6e5d927