Fixed work address prepopulator for new labels. #3029

Also takes care of #3566