fixes #6497: New Organization: Focus should exist in Name field

It doesn't really matter if it's easier to read leave it as it is.