Fix bug with the mms_server token replacement and add attribute