Now displays questions when registration over
Merged conflicts