diff --git a/scripts/_NgGenerate.groovy b/scripts/_NgGenerate.groovy
index 62a5bf3..9a2d0b7 100644
--- a/scripts/_NgGenerate.groovy
+++ b/scripts/_NgGenerate.groovy
@@ -1,7 +1,7 @@
 import grails.util.GrailsNameUtils
 
 includeTargets << grailsScript("_GrailsCreateArtifacts")
-includeTargets << new File("scaffoldingPluginDir/scripts/_GrailsGenerate.groovy")
+includeTargets << new File("$scaffoldingPluginDir/scripts/_GrailsGenerate.groovy")
 includeTargets << grailsScript("_GrailsBootstrap")
 
 generateForName = null
diff --git a/src/groovy/grails/plugin/angularscaffolding/AngularTemplateGenerator.groovy b/src/groovy/grails/plugin/angularscaffolding/AngularTemplateGenerator.groovy
index 607279a..cbbf69d 100644
--- a/src/groovy/grails/plugin/angularscaffolding/AngularTemplateGenerator.groovy
+++ b/src/groovy/grails/plugin/angularscaffolding/AngularTemplateGenerator.groovy
@@ -20,7 +20,7 @@ class AngularTemplateGenerator extends DefaultGrailsTemplateGenerator
 	def renderEditor = { property, prefix ->
 		def domainClass = property.domainClass
 		def cp
-		if (pluginManager?.hasGrailsPlugin('hibernate')) {
+		if (pluginManager?.hasGrailsPlugin('hibernate4')||pluginManager?.hasGrailsPlugin('hibernate3')) {
 			cp = domainClass.constrainedProperties[property.name]
 		}
 
diff --git a/src/templates/scaffolding/renderEditor.template b/src/templates/scaffolding/renderEditor.template
index 7283bb0..b346117 100644
--- a/src/templates/scaffolding/renderEditor.template
+++ b/src/templates/scaffolding/renderEditor.template
@@ -1,4 +1,8 @@
 <%
+    if (pluginManager?.hasGrailsPlugin('hibernate4') || pluginManager?.hasGrailsPlugin('hibernate3')) {
+        cp = domainClass.constrainedProperties[property.name]
+    }
+
 	def name = prefix ? "${prefix}${property.name}" : property.name
 
     switch (property.type) {