Fix configuration and user session script files

Change-Id: I218bb8451e3558fe4738e39b887e7c6a712c0049