refs #36 modify organization edit flow