@zaach - if you look at https://github.com/mozilla/fxa-content-server/pull/584/files#diff-d402cb339d6b554dcd31a2de738e1f28R25, we are replacing dashes with underscores on the client too. We could just do away with the transformation globally.