Fix empty string problem for remote user