EAuth custom service fix