registration templates fixes