Bring back address picking via param

Originally checked in 753c650e1e471f21215e480d198384c61856eb61 and lost
later on in 7c5e414b083b41253fbb19fcb08dcc6e8345e1c9

// @phstc @GeekOnCoffee