diff --git a/database/migrations/07-guilds.sql b/database/migrations/07-guilds.sql
index 25a868e..0cabe37 100644
--- a/database/migrations/07-guilds.sql
+++ b/database/migrations/07-guilds.sql
@@ -2,6 +2,6 @@ CREATE TABLE guild (
 	discord_id TEXT NOT NULL,
 	guild_id TEXT NOT NULL,
 	guild_name TEXT NOT NULL,
-	bridge INTEGER(1) DEFAULT FALSE,
+	bridge BOOLEAN DEFAULT FALSE,
 	PRIMARY KEY(discord_id, guild_id)
 );
diff --git a/database/userquery.go b/database/userquery.go
index e9c8baa..8d67145 100644
--- a/database/userquery.go
+++ b/database/userquery.go
@@ -18,7 +18,7 @@ func (uq *UserQuery) New() *User {
 }
 
 func (uq *UserQuery) GetByMXID(userID id.UserID) *User {
-	query := "SELECT mxid, id, management_room, token FROM user WHERE mxid=$1"
+	query := `SELECT mxid, id, management_room, token FROM "user" WHERE mxid=$1`
 	row := uq.db.QueryRow(query, userID)
 	if row == nil {
 		return nil
@@ -28,7 +28,7 @@ func (uq *UserQuery) GetByMXID(userID id.UserID) *User {
 }
 
 func (uq *UserQuery) GetByID(id string) *User {
-	query := "SELECT mxid, id, management_room, token FROM user WHERE id=$1"
+	query := `SELECT mxid, id, management_room, token FROM "user" WHERE id=$1`
 	row := uq.db.QueryRow(query, id)
 	if row == nil {
 		return nil
@@ -38,7 +38,7 @@ func (uq *UserQuery) GetByID(id string) *User {
 }
 
 func (uq *UserQuery) GetAll() []*User {
-	rows, err := uq.db.Query("SELECT mxid, id, management_room, token FROM user")
+	rows, err := uq.db.Query(`SELECT mxid, id, management_room, token FROM "user"`)
 	if err != nil || rows == nil {
 		return nil
 	}