Fixed small bug with accounts