If working tasks are carried out in inadequate conditions, workers with functional limitations may, over time, risk developing further disabilities. While several validated risk assessment methods exist for able-bodied workers, few studies have been carried out for workers with disabilities. This paper, which reports the preliminary findings of a Study funded by the Italian Ministry of Labour, describes a general methodology for the technical and organizational re-design of a worksite, based on risk assessment and irrespective of any worker disability. To this end, two samples of disabled workers, composed of people with mild and severe motor disabilities, were recruited. By using a mix of risk assessment methods and the ICF taxonomy, an adapted worksite was designed for the individual workers in the study, and a prospective evaluation was carried out to check whether the new design would eliminate the risks. One case study is reported in detail - a man with congenital malformations who works as a help-desk operator for technical assistance in the ICT department of a big organization.