am 247520c3: More User Settings improvements

* commit '247520c369370885a1c085e53ee679dce0fd55ce':
  More User Settings improvements