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