Add users controller and fix