Suggested Stackoverlow fix
Update fix
Back to old auth setup