Fix some registration enrollment bugs
Fix some registration enrollment client bugs