diff --git a/src/beautifiers/sqlformat.coffee b/src/beautifiers/sqlformat.coffee
index 892b223..375ee30 100644
--- a/src/beautifiers/sqlformat.coffee
+++ b/src/beautifiers/sqlformat.coffee
@@ -17,8 +17,8 @@ module.exports = class Sqlformat extends Beautifier
       @tempFile("input", text)
       "--reindent"
       "--indent_width=#{options.indent_size}" if options.indent_size?
-      "--keywords=#{options.keywords}" if options.keywords?
-      "--identifiers=#{options.identifiers}" if options.identifiers?
+      "--keywords=#{options.keywords}" if (options.keywords? && options.keywords != 'unchanged')
+      "--identifiers=#{options.identifiers}" if (options.identifiers? && options.identifiers != 'unchanged')
       ], help: {
         link: "https://github.com/andialbrecht/sqlparse"
       })
diff --git a/src/languages/sql.coffee b/src/languages/sql.coffee
index 92434be..756d105 100644
--- a/src/languages/sql.coffee
+++ b/src/languages/sql.coffee
@@ -37,11 +37,11 @@ module.exports = {
       type: 'string'
       default: "upper"
       description: "Change case of keywords"
-      enum: ["lower","upper","capitalize"]
+      enum: ["unchanged","lower","upper","capitalize"]
     identifiers:
       type: 'string'
-      default: "lower"
+      default: "unchanged"
       description: "Change case of identifiers"
-      enum: ["lower","upper","capitalize"]
+      enum: ["unchanged","lower","upper","capitalize"]
 
 }