You can update users UPN with following powershell command:
Get-AzureADUser -ObjectId 22764580-e033-ff33-88c9-dc21df5670ee | Set-AzureADUser -UserPrincipalName 'username@yourcompany.onmicrosoft.com'
You have to replace the object id with your users object id.
Hope this helps.