Fix not clearing after user change