User preferences

Change-Id: I814bc3e5e36568ac1ea161bb19e84591965f1938