Ashwin/Ajay | Fixing subject registration after edit.