Heri & Sophie | #2612 & 2607 | Making fields editable on upgrade page