Logins now set up, make sure to merge schema