diff --git a/smradius/util.pm b/smradius/util.pm
index 5ae965794c4827d767689472dc12e8bd7be4972c..76052f9d15c1251f9336a735673bacb8f29fc92a 100644
--- a/smradius/util.pm
+++ b/smradius/util.pm
@@ -67,8 +67,12 @@ sub templateReplace
 	while (my ($entireMacro,$section,$item,$default) = ($string =~ /(\%{([a-z]+)\.([a-z0-9\-]+)(?:=([^}]+))?})/i )) {
 		# Replace macro with ?	
 		$string =~ s/$entireMacro/\?/;
+
+		# Get value to substitute
+		my $value = defined($hashref->{$section}->{$item}) ? $hashref->{$section}->{$item} : $default;
+
 		# Add value onto our array
-		push(@valueArray,$hashref->{$section}->{$item});
+		push(@valueArray,$value);
 		
 	}