BUG-432 Registration change