removed one line from EditUser because of conflict