Allow to select address here too

Authored by mlaurent on Mar 21 2018, 1:00 PM.