A cleaning composition with a corrosion inhibitor system and an active halogen-based bleaching system and aqueous solution is described for inhibiting corrosion of metal surfaces to which the composition is applied, especially when the cleaning composition is not rinsed from the treated metal surface prior to drying of the composition on the metal surface. The corrosion inhibitor is at least an alkyl phosphonate compound, wherein the alkyl group has 6 or more carbon atoms, and salts thereof. The bleaching system includes one or more sources of hypohalous acid or hypohalite ion, such as a stabilized hypochlorite solution, in particular a mixture of N-chlorosulfamate salts.