Registration bug fix
New bootstrap and registration fix