Fix for bug 989650 and bug 988115

 - also added additional check in oo-admin-chk