Callback function now executed with right User

and some minor fixes