diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorWriter.java b/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorWriter.java
index cb1e298649..be13942f0e 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorWriter.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorWriter.java
@@ -120,6 +120,8 @@ public abstract class GeneratorWriter<W extends GeneratorWriter<W>> {
 
     @SuppressWarnings("unchecked")
     public W print(String string, Object... args) {
+        string = string.replaceAll("\t", tabString);
+
         if (newline && indentTabs > 0) {
             for (int i = 0; i < indentTabs; i++)
                 sb.append(tabString);
diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
index 075a739d02..e8e80b52d5 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
@@ -675,7 +675,7 @@ public class JavaGenerator extends AbstractGenerator {
         }
 
         if (identityCounter > 0) {
-            out.println("\t}");
+            out.tab(1).println("}");
         }
 
         // UniqueKeys
@@ -687,7 +687,7 @@ public class JavaGenerator extends AbstractGenerator {
         }
 
         if (uniqueKeyCounter > 0) {
-            out.println("\t}");
+            out.tab(1).println("}");
         }
 
         // ForeignKeys
@@ -699,7 +699,7 @@ public class JavaGenerator extends AbstractGenerator {
         }
 
         if (foreignKeyCounter > 0) {
-            out.println("\t}");
+            out.tab(1).println("}");
         }
 
         out.println("}");