change methods in accountsettingspage, actions and waiter