Revert "Fixed edit user (reverted back a step, and added functionality again)"

This reverts commit 63923106bf24c950bf396f97397b0b3275d1de8d.