Fix Register and login issue
Merge