Edit user form improvements