Bug fixes after testing - dynamic client registration testing and working :)