I noticed the Date of Birth field in User Profile Edit Form generates a broken html.

The issue is to due the extra info about the date format being added with broken html around it.

Might be related to this: #7345

Expected result

It should generate something like this (like all the other fields):

<div class="control-group">
    <div class="control-label">
            // Label here
    </div>
    <div class="controls">
            // Calendar Input here
            <span>The date of birth entered should use the format Year-Month-Day, ie 0000-00-00</span>
    </div>
</div>

Actual result

Instead it generates a clearly broken HTML like this:

<div class="control-group">
    <div class="control-label">
    </div>
</div>
<div class="controls">The date of birth entered should use the format Year-Month-Day, ie 0000-00-00</div>
<div class="control-group">
    <div class="control-label">
      // Label here
    </div>
    <div class="controls">
      // Calendar Input here
    </div>
</div>

As you can see it creates an extra control-group, and the actual "controls" is outside of it, so two problems for the price of one.

Should be an easy fix probably but not sure in which file to look, couldn't find it.