Fix #4 Account buttons are not updating