Implement Taffs suggestions on the registration