Improve mode on user files

Change-Id: I1c5405235386cd1b3b98ba018fabc967f06b06c7