Make login and registration better.
Fix conflict.