Controls Enabling and part fix for bug with addresses