bug 1013311 - Fix admin tool