Refactor users_controller & webapps_controller