Improves registration's first part to properly take into account master and doctorate...