Fix null user on rerender