Fixed logout to not require 2x actions when settings re-save.