Improved manual address setting