Last modifications to users controller
Resolved merge conflict