Make a distinction between local and non local accounts.

fixes #441