updated check for enabled or locked user