CEXT - 640 # fix
CEXT - 642 # stay in system for registration
fix