Some changes
Fix login and registration