ensure editaccount is authenticated
fix merge