Edit account form hooks

Fixes #5676
Closes #5677