Fixing auth duplicated tokens bug