diff --git a/api/applyEffects.php b/api/applyEffects.php
index af4d0fa2f..6bf281bc3 100644
--- a/api/applyEffects.php
+++ b/api/applyEffects.php
@@ -29,7 +29,7 @@
         $collageSrcImagePaths[] = $collageBasename . '-' . $i . '.jpg';
     }
 
-    if (!createCollage($collageSrcImagePaths, $filename_tmp, $config['take_frame'], $config['take_frame_path'])) {
+    if (!createCollage($collageSrcImagePaths, $filename_tmp, $config['take_collage_frame'], $config['take_collage_frame_path'])) {
         die(json_encode([
             'error' => 'Could not create collage'
         ]));
diff --git a/config/config.inc.php b/config/config.inc.php
index 6ec6c51bb..e1c55b4ea 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -37,6 +37,8 @@
 $config['polaroid_rotation'] = '0';
 $config['take_frame'] = false;
 $config['take_frame_path'] = '../resources/img/frames/frame.png';
+$config['take_collage_frame'] = false;
+$config['take_collage_frame_path'] = '../resources/img/frames/frame.png';
 $config['chroma_keying'] = true;
 $config['use_collage'] = false;
 $config['continuous_collage'] = false;
diff --git a/lib/configsetup.inc.php b/lib/configsetup.inc.php
index 545bef45d..bf29ad606 100644
--- a/lib/configsetup.inc.php
+++ b/lib/configsetup.inc.php
@@ -158,6 +158,17 @@
 			'name' => 'use_collage',
 			'value' => $config['use_collage']
 		],
+		'take_collage_frame' => [
+			'type' => 'checkbox',
+			'name' => 'take_collage_frame',
+			'value' => $config['take_collage_frame']
+		],
+		'take_collage_frame_path' => [
+			'type' => 'input',
+			'placeholder' => $defaultConfig['take_collage_frame_path'],
+			'name' => 'take_collage_frame_path',
+			'value' => $config['take_collage_frame_path']
+		],
 		'collage_cntdwn_time' => [
 			'type' => 'input',
 			'name' => 'collage_cntdwn_time',
diff --git a/resources/lang/de.js b/resources/lang/de.js
index 04ac7bae2..4944818d9 100644
--- a/resources/lang/de.js
+++ b/resources/lang/de.js
@@ -122,6 +122,8 @@ const L10N = {
     'polaroid_effect': 'Polaroid Effekt',
     'general_polaroid_rotation': 'Polaroid Bild-Rotation',
     'use_collage': 'Foto-Collage erlauben',
+    'take_collage_frame': 'Foto-Collage mit Rahmen aufnehmen',
+    'take_collage_frame_path': 'Rahmen',
     'take_frame': 'Bild mit Rahmen aufnehmen',
     'general_take_frame_path': 'Rahmen',
     'print_frame': 'Rahmen auf Bild drucken',
diff --git a/resources/lang/en.js b/resources/lang/en.js
index ced04b242..204246e74 100644
--- a/resources/lang/en.js
+++ b/resources/lang/en.js
@@ -122,6 +122,8 @@ const L10N = {
     'polaroid_effect': 'Polaroid effect',
     'general_polaroid_rotation': 'Polaroid picture rotation',
     'use_collage': 'Allow photo collage',
+    'take_collage_frame': 'Take collage with frame',
+    'take_collage_frame_path': 'Frame',
     'take_frame': 'Take picture with frame',
     'general_take_frame_path': 'Frame',
     'print_frame': 'Print frame on picture',