diff --git a/resources/db_update_scripts/current.sql b/resources/db_update_scripts/current.sql
index e69de29bb2..ac93f1a5d6 100644
--- a/resources/db_update_scripts/current.sql
+++ b/resources/db_update_scripts/current.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `general_system_settings`
+ADD matchAlgorithmMatchesAreForceAccepted bit(1) NOT NULL;
\ No newline at end of file
diff --git a/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminGeneralSettingsPage.html b/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminGeneralSettingsPage.html
index d41564a54e..778cefd97e 100644
--- a/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminGeneralSettingsPage.html
+++ b/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminGeneralSettingsPage.html
@@ -38,6 +38,12 @@
                     <td><input name="7" type="checkbox" wicket:id="supervisorsCanAcceptDeclinePIs" />
                     </td>
                 </tr>
+                <tr>
+                    <td><label for="7">Matching algorithm matches are force accepted:</label>
+                    </td>
+                    <td><input name="7" type="checkbox" wicket:id="matchAlgorithmMatchesAreForceAccepted" />
+                    </td>
+                </tr>
 
 
 			</table>
diff --git a/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminGeneralSettingsPage.java b/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminGeneralSettingsPage.java
index 14a74899b9..aa900b186f 100644
--- a/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminGeneralSettingsPage.java
+++ b/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminGeneralSettingsPage.java
@@ -38,11 +38,14 @@ public class AdminGeneralSettingsPage extends AbstractAdminSettingsPage {
 			TextField<String> smtpServer = new RequiredTextField<String>("smtpServer");
 			CheckBox mailNotifications = new CheckBox("mailNotifications");
             CheckBox supervisorsCanAcceptDeclinePIs = new CheckBox("supervisorsCanAcceptDeclinePIs");
+            CheckBox matchAlgorithmMatchesAreForceAccepted = new CheckBox("matchAlgorithmMatchesAreForceAccepted");
+
 			add(mailFromName);
 			add(systemFromMail);
 			add(smtpServer);
 			add(mailNotifications);
             add(supervisorsCanAcceptDeclinePIs);
+            add(matchAlgorithmMatchesAreForceAccepted);
 		}
 
 		@Override
diff --git a/src/main/java/se/su/dsv/scipro/data/dataobjects/GeneralSystemSettings.java b/src/main/java/se/su/dsv/scipro/data/dataobjects/GeneralSystemSettings.java
index 9c9d84f579..c95ae1bf1c 100644
--- a/src/main/java/se/su/dsv/scipro/data/dataobjects/GeneralSystemSettings.java
+++ b/src/main/java/se/su/dsv/scipro/data/dataobjects/GeneralSystemSettings.java
@@ -62,7 +62,18 @@ public class GeneralSystemSettings extends DomainObject{
         this.supervisorsCanAcceptDeclinePIs = supervisorsCanAcceptDeclinePIs;
     }
 
-	@Basic(optional=false)
+    @Basic(optional=false)
+    private boolean matchAlgorithmMatchesAreForceAccepted = true;
+
+    public boolean isMatchAlgorithmMatchesAreForceAccepted() {
+        return matchAlgorithmMatchesAreForceAccepted;
+    }
+
+    public void setMatchAlgorithmMatchesAreForceAccepted(boolean matchAlgorithmMatchesAreForceAccepted) {
+        this.matchAlgorithmMatchesAreForceAccepted = matchAlgorithmMatchesAreForceAccepted;
+    }
+
+    @Basic(optional=false)
 	private boolean finalSeminarThesisMustBeAPDF = false;
 	
 	@Basic(optional=false)