Bugfix on not set current user