Fix small bug on back-end registration.
Merge remote-tracking branch 'origin/master'