diff --git a/couchpotato/core/plugins/profile/main.py b/couchpotato/core/plugins/profile/main.py
index 8dc5933..1098719 100644
--- a/couchpotato/core/plugins/profile/main.py
+++ b/couchpotato/core/plugins/profile/main.py
@@ -38,9 +38,18 @@ class ProfilePlugin(Plugin):
 
     def forceDefaults(self):
 
+        db = get_db()
+
+        # Fill qualities and profiles if they are empty somehow..
+        if db.count(db.all, 'profile') == 0:
+
+            if db.count(db.all, 'quality') == 0:
+                fireEvent('quality.fill', single = True)
+
+            self.fill()
+
         # Get all active movies without profile
         try:
-            db = get_db()
             medias = fireEvent('media.with_status', 'active', single = True)
 
             profile_ids = [x.get('_id') for x in self.all()]
diff --git a/couchpotato/core/plugins/quality/main.py b/couchpotato/core/plugins/quality/main.py
index 7bb3379..6304924 100644
--- a/couchpotato/core/plugins/quality/main.py
+++ b/couchpotato/core/plugins/quality/main.py
@@ -1,5 +1,6 @@
 import traceback
 import re
+from CodernityDB.database import RecordNotFound
 
 from couchpotato import get_db
 from couchpotato.api import addApiView
@@ -51,6 +52,7 @@ class QualityPlugin(Plugin):
         addEvent('quality.order', self.getOrder)
         addEvent('quality.ishigher', self.isHigher)
         addEvent('quality.isfinish', self.isFinish)
+        addEvent('quality.fill', self.fill)
 
         addApiView('quality.size.save', self.saveSize)
         addApiView('quality.list', self.allView, docs = {
@@ -152,24 +154,31 @@ class QualityPlugin(Plugin):
             order = 0
             for q in self.qualities:
 
-                db.insert({
-                    '_t': 'quality',
-                    'order': order,
-                    'identifier': q.get('identifier'),
-                    'size_min': tryInt(q.get('size')[0]),
-                    'size_max': tryInt(q.get('size')[1]),
-                })
-
-                log.info('Creating profile: %s', q.get('label'))
-                db.insert({
-                    '_t': 'profile',
-                    'order': order + 20,  # Make sure it goes behind other profiles
-                    'core': True,
-                    'qualities': [q.get('identifier')],
-                    'label': toUnicode(q.get('label')),
-                    'finish': [True],
-                    'wait_for': [0],
-                })
+                existing = None
+                try:
+                    existing = db.get('quality', q.get('identifier'))
+                except RecordNotFound:
+                    pass
+
+                if not existing:
+                    db.insert({
+                        '_t': 'quality',
+                        'order': order,
+                        'identifier': q.get('identifier'),
+                        'size_min': tryInt(q.get('size')[0]),
+                        'size_max': tryInt(q.get('size')[1]),
+                    })
+
+                    log.info('Creating profile: %s', q.get('label'))
+                    db.insert({
+                        '_t': 'profile',
+                        'order': order + 20,  # Make sure it goes behind other profiles
+                        'core': True,
+                        'qualities': [q.get('identifier')],
+                        'label': toUnicode(q.get('label')),
+                        'finish': [True],
+                        'wait_for': [0],
+                    })
 
                 order += 1