Review registrar's code

[xmonader]

and based on the findings please open tickets and sort the priority with @ashraffouda