master: adding some additional checks for stuck users