merge edit user link back in