Rework of google authentication