Minor fix on CurrentUser