Issue #46 ,modified admin validation