diff --git a/gnuviechadmin/hostingpackages/migrations/0003_auto_20150118_1407.py b/gnuviechadmin/hostingpackages/migrations/0003_auto_20150118_1407.py
new file mode 100644
index 0000000..8d7e82d
--- /dev/null
+++ b/gnuviechadmin/hostingpackages/migrations/0003_auto_20150118_1407.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hostingpackages', '0002_auto_20150118_1319'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='customermailboxoption',
+            name='template',
+            field=models.ForeignKey(verbose_name='mailbox option template', to='hostingpackages.MailboxOption', help_text='The mailbox option template that this mailbox option is based on'),
+            preserve_default=True,
+        ),
+    ]
diff --git a/gnuviechadmin/hostingpackages/models.py b/gnuviechadmin/hostingpackages/models.py
index f84a9c1..15e98b9 100644
--- a/gnuviechadmin/hostingpackages/models.py
+++ b/gnuviechadmin/hostingpackages/models.py
@@ -255,7 +255,7 @@ class CustomerMailboxOption(MailboxOptionBase,
 
     """
     template = models.ForeignKey(
-        UserDatabaseOption,
+        MailboxOption,
         verbose_name=_('mailbox option template'),
         help_text=_(
             'The mailbox option template that this mailbox option is based on'