fix #832 - default organisation gets filled again