Fixed calculations for user addresses