Properly set the tag for the UAA sub module
https://www.pivotaltracker.com/story/show/75998954
[#75998954]