Properly prefill address in the middle of the call

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>