Modal correctly use a default organization if available