Replace USER as well