Bug 1012782 - oo-admin-chk fix

[merge]