diff --git a/htdocs/artefact/peerassessment/lib.php b/htdocs/artefact/peerassessment/lib.php
index 29ca957b2..8b0d54206 100644
--- a/htdocs/artefact/peerassessment/lib.php
+++ b/htdocs/artefact/peerassessment/lib.php
@@ -253,8 +253,8 @@ class ArtefactTypePeerassessment extends ArtefactType {
 
         $data = (object)array(
             'assessment'    => $this->get('id'),
-            'block'         => $this->get('block'),
-            'usr'           => $this->get('usr'),
+            'block'         => $this->get('block') ? $this->get('block') : $this->id ,
+            'usr'           => $this->get('usr') ? $this->get('usr') : $this->get('owner'),
             'view'          => $this->get('view'),
             'private'       => ($this->get('private') ? 1 : 0),
         );
diff --git a/htdocs/import/leap/lib.php b/htdocs/import/leap/lib.php
index 97075af25..6fac3f783 100644
--- a/htdocs/import/leap/lib.php
+++ b/htdocs/import/leap/lib.php
@@ -1249,7 +1249,7 @@ class PluginImportLeap extends PluginImport {
             }
             $rowscolssql = '';
             for ($i=0; $i<count($columnids); $i++) {
-                $rowscolssql .= '(row = ' . ($i+1) . ' AND columns = ' . $columnids[$i+1] . ')';
+                $rowscolssql .= '(`row` = ' . ($i+1) . ' AND columns = ' . $columnids[$i+1] . ')';
                 if ($i != (count($columnids)-1)) {
                     $rowscolssql .= ' OR ';
                 }