Fixed settings not sticking in first three minutes

Closes #1042