diff --git a/db/install.xml b/db/install.xml
index 1e2a789..f6ac796 100644
--- a/db/install.xml
+++ b/db/install.xml
@@ -23,7 +23,7 @@
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id" COMMENT="Primary key for customcert"/>
-        <KEY NAME="template" TYPE="foreign" FIELDS="templateid" REFTABLE="customcert_template" REFFIELDS="id"/>
+        <KEY NAME="template" TYPE="foreign" FIELDS="templateid" REFTABLE="customcert_templates" REFFIELDS="id"/>
       </KEYS>
     </TABLE>
     <TABLE NAME="customcert_templates" COMMENT="Stores each customcert template">
@@ -67,7 +67,7 @@
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id" COMMENT="Primary key for customcert_pages"/>
-        <KEY NAME="template" TYPE="foreign" FIELDS="templateid" REFTABLE="customcert_template" REFFIELDS="id"/>
+        <KEY NAME="template" TYPE="foreign" FIELDS="templateid" REFTABLE="customcert_templates" REFFIELDS="id"/>
       </KEYS>
     </TABLE>
     <TABLE NAME="customcert_elements" COMMENT="Stores the elements for a given page">
diff --git a/db/upgrade.php b/db/upgrade.php
index 0b213ce..3a516c0 100644
--- a/db/upgrade.php
+++ b/db/upgrade.php
@@ -146,5 +146,25 @@ function xmldb_customcert_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2018051705, 'customcert');
     }
 
+    if ($oldversion < 2018120305) {
+        $table = new xmldb_table('customcert');
+        $index = new xmldb_index('templateid', XMLDB_INDEX_UNIQUE, ['templateid']);
+        if ($dbman->index_exists($table, $index)) {
+            $dbman->drop_index($table, $index);
+        }
+        $key = new xmldb_key('templateid', XMLDB_KEY_FOREIGN, array('templateid'), 'customcert_templates', array('id'));
+        $dbman->add_key($table, $key);
+
+        $table = new xmldb_table('customcert_pages');
+        $index = new xmldb_index('templateid', XMLDB_INDEX_UNIQUE, ['templateid']);
+        if ($dbman->index_exists($table, $index)) {
+            $dbman->drop_index($table, $index);
+        }
+        $key = new xmldb_key('templateid', XMLDB_KEY_FOREIGN, array('templateid'), 'customcert_templates', array('id'));
+        $dbman->add_key($table, $key);
+
+        upgrade_mod_savepoint(true, 2018120305, 'customcert');
+    }
+
     return true;
 }
diff --git a/version.php b/version.php
index 9a693f6..a52c555 100644
--- a/version.php
+++ b/version.php
@@ -24,10 +24,10 @@
 
 defined('MOODLE_INTERNAL') || die('Direct access to this script is forbidden.');
 
-$plugin->version   = 2018120304; // The current module version (Date: YYYYMMDDXX).
+$plugin->version   = 2018120305; // The current module version (Date: YYYYMMDDXX).
 $plugin->requires  = 2018120300; // Requires this Moodle version (3.6).
 $plugin->cron      = 0; // Period for cron to check this module (secs).
 $plugin->component = 'mod_customcert';
 
 $plugin->maturity  = MATURITY_STABLE;
-$plugin->release   = "3.6.4"; // User-friendly version number.
+$plugin->release   = "3.6.5"; // User-friendly version number.