edited templates to remove id and password