fixed unsused CurrentUserId