controllers and users fix