[Anastasia] changed a bit the way we get the current user such that address can still belongTo user. feel free to revert