I think both would be good, probably as separate bugs, since the link is a two-line fix and site-scheming is a bigger job. As you say, sometimes you want to go back to admin and sometimes you want to go somewhere else.