Fixed some registration validation issues.
PAR-1 #resolve