and fix login