Icon set on form-group div and not input box

[nvernooy]

I'm sure this is how you designed in, and it all works in your demo. But I'm using a column layout for my form and the input boxes are not the full width of the form-group div, so the valid/invalid icon displays outside the box.
Just an example of my html:

<form class="form-horizontal" name="addForm" novalidate>
            <div class="form-group">
                    <label for="inputName" class="col-sm-2 control-label">Name:</label>
                    <input type="text"
                           class="col-sm-7"
                           id="inputName"
                           name="inputName"
                           data-ng-model="formData.Name"
                           required
                           autofocus>
            </div>
</form

Is there an easy way to fix this?