Fixes issue on the registration validation process
Merge branch 'hotfix/2014-02.2.6'