Fix current_user tagging bug