Fix payload handler when providing certificate keys as keywords

Fix payload handler when providing certificate keys as keywords #1873