Systems and methods for diabetes management with automatic basal and manual bolus insulin control are presented. An exemplary system includes a delivery device, a glucose sensor, and a controller. The delivery device delivers insulin and the glucose sensor measures glucose levels of the subject. A basal insulin dose is calculated using a model predictive control algorithm and physiological data of the subject including desired glucose levels, amounts of the delivered insulin and the measured glucose levels. A manual bolus insulin dose is initiated by the subject. The manual bolus insulin dose is modified based on one or both of the model predictive control algorithm and the physiological data of the subject. A total insulin dose is determined based on the modified manual bolus insulin dose and the calculated basal insulin dose, and delivered to the subject.
