improve User Settings hackery