diff --git a/document_page_multi_company/__init__.py b/document_page_multi_company/__init__.py
index 19c4eb32..5c8245ab 100644
--- a/document_page_multi_company/__init__.py
+++ b/document_page_multi_company/__init__.py
@@ -19,6 +19,6 @@
 #
 ##############################################################################
 
-import document_page_multi_company
+from . import document_page_multi_company
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/document_page_multi_company/document_page_multi_company.py b/document_page_multi_company/document_page_multi_company.py
index de93b0b1..aed9d939 100644
--- a/document_page_multi_company/document_page_multi_company.py
+++ b/document_page_multi_company/document_page_multi_company.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from openerp.osv import fields, orm
 
 
@@ -28,7 +29,8 @@ class document_page_history(orm.Model):
     }
 
     _defaults = {
-        'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
+        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')
+        ._company_default_get(cr, uid, 'document_page_history', context=c)
     }
 
 
@@ -39,7 +41,8 @@ class document_page(orm.Model):
     }
 
     _defaults = {
-        'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
+        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')
+        ._company_default_get(cr, uid, 'document_page', context=c)
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: