diff --git a/src/program.py b/src/program.py
index b446c87..62b25fc 100644
--- a/src/program.py
+++ b/src/program.py
@@ -219,7 +219,7 @@ Die aktuelle Hoehe betraegt {3:.0f} cm.
 Gruesse vom Tank-Computer""".format(meas, sender_email, receiver_email, val)
     context = ssl.create_default_context()
     with smtplib.SMTP(smtp_server, smtp_port) as server:
-        server.set_debuglevel(1)
+        #server.set_debuglevel(1)
         server.ehlo()
         server.starttls(context=context)
         server.login(sender_email, smtp_password.strip())
@@ -337,11 +337,18 @@ if __name__ == '__main__':
                     if button_cl.is_pressed:
                         store_value(config, val, "Chlor", "voll", "datum_voll")
                         cl_voll = val
-                        break;
+                        cl_mail = 0
+                        mavg_cl = MovingAverage(AVG_WINDOWSIZE)
+                        config.set('Chlor', 'mail', str(cl_mail))
+                        config.set('Chlor', 'datum_mail', "")
+                        with open(FILE, 'w') as configfile:
+                            config.write(configfile)
+                        break
                     elif button_ph.is_pressed:
                         print("Abbruch!")
                         break
                 buttons.set_state(States.MAIN_MENU)
+                force_update = True
                 buttons.activate_events()
             elif state == States.MEASURE_CL_EMPTY:
                 buttons.deactivate_events()
@@ -359,6 +366,7 @@ if __name__ == '__main__':
                         print("Abbruch!")
                         break
                 buttons.set_state(States.MAIN_MENU)
+                force_update = True
                 buttons.activate_events()
             elif state == States.MEASURE_PH_FULL:
                 buttons.deactivate_events()
@@ -371,11 +379,18 @@ if __name__ == '__main__':
                     if button_cl.is_pressed:
                         store_value(config, val, "pH-", "voll", "datum_voll")
                         ph_voll = val
-                        break;
+                        ph_mail = 0
+                        mavg_ph = MovingAverage(AVG_WINDOWSIZE)
+                        config.set('pH-', 'mail', str(ph_mail))
+                        config.set('pH-', 'datum_mail', "")
+                        with open(FILE, 'w') as configfile:
+                            config.write(configfile)
+                        break
                     elif button_ph.is_pressed:
                         print("Abbruch!")
                         break
                 buttons.set_state(States.MAIN_MENU)
+                force_update = True
                 buttons.activate_events()
             elif state == States.MEASURE_PH_EMPTY:
                 buttons.deactivate_events()
@@ -388,11 +403,12 @@ if __name__ == '__main__':
                     if button_cl.is_pressed:
                         store_value(config, val, "pH-", "leer", "datum_leer")
                         ph_leer = val
-                        break;
+                        break
                     elif button_ph.is_pressed:
                         print("Abbruch!")
                         break
                 buttons.set_state(States.MAIN_MENU)
+                force_update = True
                 buttons.activate_events()
             elif state == States.SHUTDOWN:
                 shutdown(epd)
@@ -444,4 +460,4 @@ if __name__ == '__main__':
                         force_update = True
             time.sleep(0.5)
         except KeyboardInterrupt:
-            shutdown(epd)
\ No newline at end of file
+            shutdown(epd)