diff --git a/etiquette/constants.py b/etiquette/constants.py
index 503d9e0..cb98a6d 100644
--- a/etiquette/constants.py
+++ b/etiquette/constants.py
@@ -152,6 +152,8 @@ DEFAULT_CONFIGURATION = {
     'enable_new_tag': True,
     'enable_new_user': True,
     'enable_photo_add_remove_tag': True,
+    'enable_photo_reload_metadata': True,
+    'enable_photo_generate_thumbnail': True,
 
     'min_tag_name_length': 1,
     'max_tag_name_length': 32,
diff --git a/etiquette/objects.py b/etiquette/objects.py
index b9bf63e..d566947 100644
--- a/etiquette/objects.py
+++ b/etiquette/objects.py
@@ -528,6 +528,9 @@ class Photo(ObjectBase):
         special:
             For videos, you can provide a `timestamp` to take the thumbnail from.
         '''
+        if not self.photodb.config['enable_photo_generate_thumbnail']:
+            raise exceptions.FeatureDisabled('photo.generate_thumbnail')
+
         hopeful_filepath = self.make_thumbnail_filepath()
         hopeful_filepath = hopeful_filepath.relative_path
         #print(hopeful_filepath)
@@ -659,6 +662,9 @@ class Photo(ObjectBase):
         '''
         Load the file's height, width, etc as appropriate for this type of file.
         '''
+        if not self.photodb.config['enable_photo_reload_metadata']:
+            raise exceptions.FeatureDisabled('photo.reload_metadata')
+
         self.bytes = os.path.getsize(self.real_filepath)
         self.width = None
         self.height = None