+ added stuff to comply with new user restriction system