Work on PopUser module, improve auth