Fixed #891: Bug - Error when migrating from ispCP
Several fixes