account bug fixes