diff --git a/app/forms.py b/app/forms.py
index 977675c..81e656d 100644
--- a/app/forms.py
+++ b/app/forms.py
@@ -34,7 +34,7 @@ class Step2Form(FlaskForm):
     butterbox_name = StringField(_l('Butterbox Name'), validators=[DataRequired()])
     butterbox_logo = FileField((_l('Butterbox Logo')), validators=[FileAllowed(['jpg', 'png', 'svg'], _l('Images only!'))])
     butterbox_hostname = StringField(_l('Butterbox Hostname'), validators=[DataRequired(), Length(1, 64), hostname_check])
-    butterbox_date = DateTimeField(_l('Butterbox Date'), format='%d/%m/%Y, %H:%M:%S')
+    butterbox_date = DateTimeField(_l('Butterbox Date'), format='%Y-%m-%dT%H:%M:%SZ')
 
     submit = SubmitField(_l('Next'))
 
diff --git a/app/routes.py b/app/routes.py
index 72d7ff0..0c504bb 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -269,9 +269,9 @@ def step4():
                 setting_value = getattr(form, s).data
                 set_setting(s, setting_value)
             set_setting('first_setup', "false")
+            dump_settings("settings.txt")
             run_madmail_installer()
             db.session.commit()
-            dump_settings("settings.txt")
             return redirect(url_for('setup_complete'))
     if get_setting("first_setup") == "true":
         return render_template('step4.html', form=form, get_setting=get_setting)
diff --git a/app/static/time.js b/app/static/time.js
index ba1d54c..38d3ef7 100644
--- a/app/static/time.js
+++ b/app/static/time.js
@@ -1,6 +1,7 @@
 document.addEventListener('DOMContentLoaded', () => {
 var currentTime = new Date();
 const $myDatetimeField =  document.querySelector('#butterbox_date')
-    $myDatetimeField.value = currentTime.toLocaleString();
+    console.log(currentTime.toISOString().substring(0, 19));
+    $myDatetimeField.value = currentTime.toISOString().substring(0, 19) + 'Z';
 
 });
\ No newline at end of file
diff --git a/change_manager.py b/change_manager.py
index 7864fa6..f1f8449 100644
--- a/change_manager.py
+++ b/change_manager.py
@@ -137,6 +137,7 @@ def check_settings(raspap_installed: bool):
     diff_in_minutes = (datetime.now().timestamp() - last_modified)/60
     needs_restart = False
     if diff_in_minutes < 1:
+        time.sleep(4)
         for s in CHANGES_REQUIRING_RESTART:
             print(f"Now at setting: {s}")
             if s == "wifi_password" and raspap_installed: