Updated Edit User functionality