Register validation and shared pref update
Merge