Display correct name of closed account

Detecting a closed account worked but the name provided to the user did
not match reality. This change extracts the right name.

Candidate for a backport to 4.8 which contains a similar wrong logic.