Work in Registration and Login
Fix conflicts :)