And properly update the username in the link