diff --git a/classes/User.php b/classes/User.php
index 96a7482ead..cef4769f33 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -101,7 +101,12 @@ class User extends DB_DataObject
 			return true;
 		}
 		$toupdate = implode(', ', $parts);
-		$qry = 'UPDATE ' . $this->tableName() . ' SET ' . $toupdate .
+
+		$table = $this->tableName();
+		if(common_config('db','quote_identifiers')) {
+			$table = '"' . $table . '"';
+		}
+		$qry = 'UPDATE ' . $table . ' SET ' . $toupdate .
 		  ' WHERE id = ' . $this->id;
 		return $this->query($qry);
 	}