Last fixes, added multi-restricted user awareness, unification of config.