Added custom code to modify user