Updated authentication (+sync with site commit)