[3.1rc1] selected value for spam filter lost if input is invalid

When adding a new mailbox if you forget to enter a required field or make some other invalid input in form the selected value in dropbox for spam filter will be lost. This happened me 3 times in a row and every single time I had to select the spam filter again.