admin pw handling modification