Login fix, anaytics + scan fix