Change auth-token structure to suit new, simpler format