AccountSettings: Handle button states more correctly

Fixes #1779