In both cases, yes, the character would be given a body roughly approximating the appearance they used to have or the one they have in the matrix/digital space -- there would, however, be minor differences that would be noticeable to the character and tell them that this isn't exactly "their" body.

As for what these differences are, let us know if you decide to go this route and we can discuss in more detail in a mod chat.