Add extra check for guests