bug 1138: rework of the return link