Fixed some account management errors