fix options not saving properly when user enters server address or port
Merge branch 'master' into stats