OOIION-1390 Fixes Registration Problem R2