Restore some settings for secondary users

Change-Id: I418780a64f52063cb8682234dc20881261274e3a