Fix for none URN names not being passed forward
Improved orgauth generation