fixed issue with current user helpers