Fixed double account type + pending label bug