Merge pull request #1180 from valentinewallace/2021-11-remove-user-pmt-id