modified the change_user functionality