Improve reset detection of current user