Add better check for password auth requests