fixed loss of settings when logging out
Merge branch 'alpha'