diff --git a/db/core.php b/db/core.php
index 32f29c7151..3fcc9b8fa1 100644
--- a/db/core.php
+++ b/db/core.php
@@ -650,7 +650,7 @@ $schema['user_group'] = array(
     ),
     'primary key' => array('id'),
     'unique keys' => array(
-        'user_uri_key' => array('uri'),
+        'user_group_uri_key' => array('uri'),
     ),
     'foreign keys' => array(
         'user_group_design_id_fkey' => array('design', array('design_id' => 'id')),
diff --git a/lib/schema.php b/lib/schema.php
index 391f0f1fdf..6e9643b677 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -653,11 +653,7 @@ class Schema
 
     function quoteValue($val)
     {
-        if (is_int($val) || is_float($val) || is_double($val)) {
-            return strval($val);
-        } else {
-            return '"' . $this->conn->escapeSimple($val) . '"';
-        }
+        return $this->conn->quoteSmart($val);
     }
 
     /**