My issue is that in the actual forms I'm trying to submit it shows up without the hyphen, and it won't let me edit it in the forms. The only way is to change it...

Did you ever get confirmation on this? I'm having the same issue. (I've also tried editing my address as suggested, but it doesn't update it.)