For #1792: Don’t ask credentials upon each action