Fix Bug on Registration