Fix #7428 - editing client accounts