temp fix for current user bug