--- a/badges/backpack-add.php
+++ b/badges/backpack-add.php
@@ -98,7 +98,7 @@ if (!empty($issuedbadge->recipient->id)) {
                 $assertionid
             );

-            if (!$assertionentityid && strpos($sitebackpack->backpackapiurl, 'badgr')) {
+            if ($assertionentityid && strpos($sitebackpack->backpackapiurl, 'badgr')) {
                 $assertionentityid = badges_generate_badgr_open_url(
                     $sitebackpack,
                     OPEN_BADGES_V2_TYPE_ASSERTION,


diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 3976d5ffb56..2edf3111bdb 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -2911,14 +2911,13 @@ function xmldb_main_upgrade($oldversion) {
             }

             $dbman->drop_field($table, $field);
-        }

-        // Main savepoint reached.
-        upgrade_main_savepoint(true, 2020102300.02);
+            // Main savepoint reached.
+            upgrade_main_savepoint(true, 2021052500.33);
+        }
     }