Merge the login stuff