Corrected form names which meant settings were getting mixed up.