Readd user

Change-Id: I64965712c009175a46d4ccdde3fa77cd43936fe8