Fix broken shell for user

Change-Id: If3ad62f36a1e006acf426a2f101f923ad1c93766