Fixed Users problem and add someting to work better :)