fix login and other