Link Address and User

I was in mind that we had already added this.

This is the first step towards better user integration.