User Edit Bugfix