Jag/change certificate warn

Same as above.