Better registration mode handling