User admin check improved.