hotfix current_user problem
fixed handling of ToolUser