PROV-901 improve restriction processing
NOJIRA attempt to fix random logout issue