diff --git a/smradius/util.pm b/smradius/util.pm
index b91a0efa5425e1b4a58c02c153a9c5eb68e75c60..4512b3320690ee08dba01785231c5a843828f4cd 100644
--- a/smradius/util.pm
+++ b/smradius/util.pm
@@ -52,10 +52,13 @@ sub templateReplace
 			# Grab value
 			my $itemVal = $hashref->{$section}->{$item};
 			# Replace in string
-			$string =~ s/\%{$section\.$item}/$itemVal/gi;
+			$string =~ s/\%{$section\.$item(=[^}]+)?}/$itemVal/gi;
 		}
 	}
 
+	# Replace blanks
+	$string =~ s/\%{[a-z]+\.[a-z0-9\-]+(?:=([^}]+))?}/$1/gi;
+
 	return $string;
 }