Fixed 1.7 for new auth handler