diff --git a/manifests/huntgroup.pp b/manifests/huntgroup.pp
index 80a6031a53a1d5416d7e39f74760ad933c5e788e..2bef0bd852403bed199c9eee49b1c0b81826976e 100644
--- a/manifests/huntgroup.pp
+++ b/manifests/huntgroup.pp
@@ -8,13 +8,9 @@ define freeradius::huntgroup (
   $fr_basepath = $::freeradius::params::fr_basepath
   $fr_service  = $::freeradius::params::fr_service
 
-  $conditionals = join($conditions, ', ')
-
-  $content    = "${huntgroup}\t${conditionals}\n"
-
   concat::fragment { "huntgroup.${title}":
     target  => "${fr_basepath}/mods-config/preprocess/huntgroups",
-    content => $content,
+    content => template('freeradius/huntgroup.erb'),
     order   => $order,
     notify  => Service[$fr_service],
   }
diff --git a/templates/huntgroup.erb b/templates/huntgroup.erb
index 958fd3a4d937f0ae8758b6abb6805ea1726a4ae3..bfaa0d57888fa156c0ff2f456ffd2f9abc134831 100644
--- a/templates/huntgroup.erb
+++ b/templates/huntgroup.erb
@@ -1,10 +1,6 @@
 
-#
-##########################################################
-# Huntgroup Puppet Name: <%= @name %>
-#
 <%- if @conditions.is_a?(Array) -%>
-<%= @conditions.collect { |cond| @name + " " + cond }.join("\n") %>
+<%= @conditions.collect { |cond| @huntgroup + " " + cond }.join("\n") %>
 <%- else -%>
-<%= @name %> <%= @conditions %>
+<%= @huntgroup %> <%= @conditions %>
 <%- end -%>