When getting an available username, add a check to reuse the existing username if the user already has one and the openid nickname matches it
