now able to work for user's without addresses saved previously
ref #39