Added support for unauth users