Account & User Classes Update 1