Updated First Registration code