diff --git a/database/database.go b/database/database.go
index 114ce5aa..4a89e59f 100644
--- a/database/database.go
+++ b/database/database.go
@@ -49,6 +49,21 @@ func NewDatabase(cnf *config.Config) (*gorm.DB, error) {
 
 		return db, nil
 	}
+	if cnf.Database.Type == "mysql" {
+		args := fmt.Sprintf(
+			"%s:%s@tcp(%s:%d)/%s?charset=utf8&parseTime=True",
+			cnf.Database.User,
+			cnf.Database.Password,
+			cnf.Database.Host,
+			cnf.Database.Port,
+			cnf.Database.DatabaseName,
+		)
+		db, err := gorm.Open("mysql", args)
+		if err != nil {
+			return db, err
+		}
+		return db, nil
+	}
 
 	// Database type not supported
 	return nil, fmt.Errorf("Database type %s not suppported", cnf.Database.Type)
diff --git a/oauth/client.go b/oauth/client.go
index bd7f7f24..0b5ed84c 100644
--- a/oauth/client.go
+++ b/oauth/client.go
@@ -31,7 +31,7 @@ func (s *Service) ClientExists(clientID string) bool {
 func (s *Service) FindClientByClientID(clientID string) (*models.OauthClient, error) {
 	// Client IDs are case insensitive
 	client := new(models.OauthClient)
-	notFound := s.db.Where("key = LOWER(?)", clientID).
+	notFound := s.db.Where("`key` = LOWER(?)", clientID).
 		First(client).RecordNotFound()
 
 	// Not found