fixes #203 Error message unclear when trying to change org name. Leftover.
Merge branch 'master' into autnum