Fixed register & reset labels.

Fixed label assignments so that clicking on the label will focus the
correct field.
Merge pull request #3148 from dannyvink/develop

Fixed register & reset labels.