Re-add ability to set shell per-user