CurrentUser fix