bug fix: set current user correctly