More work on manage_account.feature