Add user authentication with device, and fix problems couse by that