diff --git a/smradius/modules/accounting/mod_accounting_sql.pm b/smradius/modules/accounting/mod_accounting_sql.pm
index ea8d5d2ea3bb63aa5cde48b14e8e83db2a252ff1..23b52fbe77b88b227a6168f0dff90fe7bdad0430 100644
--- a/smradius/modules/accounting/mod_accounting_sql.pm
+++ b/smradius/modules/accounting/mod_accounting_sql.pm
@@ -116,7 +116,7 @@ sub init
 			%{request.NAS-Port-Type},
 			%{request.Calling-Station-Id},
 			%{request.Called-Station-Id},
-			%{request.NAS-Port-Id=},
+			%{request.NAS-Port-Id},
 			%{request.Acct-Session-Id},
 			%{request.Framed-IP-Address},
 			%{request.Acct-Authentic},
@@ -152,7 +152,7 @@ sub init
 			Username = %{request.User-Name}
 			AND AcctSessionID = %{request.Acct-Session-Id}
 			AND NASIPAddress = %{request.NAS-IP-Address}
-			AND NASPortID = %{request.NAS-Port-Id=}
+			AND NASPortID = %{request.NAS-Port-Id}
 		GROUP BY
 			PeriodKey
 		ORDER BY
@@ -175,7 +175,7 @@ sub init
 			Username = %{request.User-Name}
 			AND AcctSessionID = %{request.Acct-Session-Id}
 			AND NASIPAddress = %{request.NAS-IP-Address}
-			AND NASPortID = %{request.NAS-Port-Id=}
+			AND NASPortID = %{request.NAS-Port-Id}
 			AND PeriodKey = %{query.PeriodKey}
 	';
 
@@ -189,7 +189,7 @@ sub init
 			Username = %{request.User-Name}
 			AND AcctSessionID = %{request.Acct-Session-Id}
 			AND NASIPAddress = %{request.NAS-IP-Address}
-			AND NASPortID = %{request.NAS-Port-Id=}
+			AND NASPortID = %{request.NAS-Port-Id}
 	';
 
 	$config->{'accounting_usage_query'} = '
@@ -215,7 +215,7 @@ sub init
 			Username = %{request.User-Name}
 			AND AcctSessionID = %{request.Acct-Session-Id}
 			AND NASIPAddress = %{request.NAS-IP-Address}
-			AND NASPortID = %{request.NAS-Port-Id=}
+			AND NASPortID = %{request.NAS-Port-Id}
 			AND PeriodKey = %{query.PeriodKey}
 		ORDER BY
 			ID
diff --git a/smradiusd.conf b/smradiusd.conf
index 1a32bc1abdd6d9ce67351559040280b041de5672..62f76b41e1d7162372d64623df977fc9ce6399b9 100644
--- a/smradiusd.conf
+++ b/smradiusd.conf
@@ -295,7 +295,7 @@ accounting_start_query=<<EOT
 		%{request.NAS-Port-Type},
 		%{request.Calling-Station-Id},
 		%{request.Called-Station-Id},
-		%{request.NAS-Port-Id=},
+		%{request.NAS-Port-Id},
 		%{request.Acct-Session-Id},
 		%{request.Framed-IP-Address},
 		%{request.Acct-Authentic},
@@ -331,7 +331,7 @@ accounting_update_get_records_query=<<EOT
 		Username = %{request.User-Name}
 		AND AcctSessionID = %{request.Acct-Session-Id}
 		AND NASIPAddress = %{request.NAS-IP-Address}
-		AND NASPortID = %{request.NAS-Port-Id=}
+		AND NASPortID = %{request.NAS-Port-Id}
 	GROUP BY
 		PeriodKey
 	ORDER BY
@@ -354,7 +354,7 @@ accounting_update_query=<<EOT
 		Username = %{request.User-Name}
 		AND AcctSessionID = %{request.Acct-Session-Id}
 		AND NASIPAddress = %{request.NAS-IP-Address}
-		AND NASPortID = %{request.NAS-Port-Id=}
+		AND NASPortID = %{request.NAS-Port-Id}
 		AND PeriodKey = %{query.PeriodKey}
 EOT
 
@@ -368,7 +368,7 @@ accounting_stop_status_query=<<EOT
 		Username = %{request.User-Name}
 		AND AcctSessionID = %{request.Acct-Session-Id}
 		AND NASIPAddress = %{request.NAS-IP-Address}
-		AND NASPortID = %{request.NAS-Port-Id=}
+		AND NASPortID = %{request.NAS-Port-Id}
 EOT
 
 accounting_usage_query=<<EOT
@@ -394,7 +394,7 @@ accounting_select_duplicates_query=<<EOT
 		Username = %{request.User-Name}
 		AND AcctSessionID = %{request.Acct-Session-Id}
 		AND NASIPAddress = %{request.NAS-IP-Address}
-		AND NASPortID = %{request.NAS-Port-Id=}
+		AND NASPortID = %{request.NAS-Port-Id}
 		AND PeriodKey = %{query.PeriodKey}
 	ORDER BY
 		ID DESC