user.save() added at critical positions