diff --git a/cgrates.json b/cgrates.json
index 6fac9ad..1a8501a 100644
--- a/cgrates.json
+++ b/cgrates.json
@@ -93,8 +93,7 @@
 				{"tag": "Subject", "path": "*cgreq.Subject", "type": "*composed", "value": "~*req.User-Name", "mandatory": true},
 				{"tag": "Destination", "path": "*cgreq.Destination", "type": "*constant", "value": "*any", "mandatory": true},
 				{"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*composed", "value": "~*req.Event-Timestamp;*now", "mandatory": true},
-				{"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*composed", "value": "~*req.Event-Timestamp;*now", "mandatory": true},
-				{"tag": "PasswordFromAttributes", "path": "*cgreq.PasswordFromAttributes", "type": "*constant", "value": "*attributes"}
+				{"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*composed", "value": "~*req.Event-Timestamp;*now", "mandatory": true}
 			],
 			"reply_fields": []
 		},
@@ -104,7 +103,7 @@
 			"flags": ["*radauth", "*pap", "*log"],
 			"request_fields": [
 				{"tag": "UserPassword", "path": "*vars.UserPassword", "type": "*variable",
-					"value": "~*cgrep.Attributes.PasswordFromAttributes"}
+					"value": "~*req.Password"}
 			],
 			"reply_fields": [
 				{"tag": "RemoveAddedFields", "filters": ["*notempty:~*cgrep.Error:"], "type": "*removeall", "path": "*rep"},
diff --git a/tariffplans/pppoe/Attributes.csv b/tariffplans/pppoe/Attributes.csv
index 13c4167..e9613cf 100644
--- a/tariffplans/pppoe/Attributes.csv
+++ b/tariffplans/pppoe/Attributes.csv
@@ -3,13 +3,13 @@
 
 # User: test - Test user for MikroTik PPPoE
 cgrates.org,ATTR_PPPOE_TEST,*any,FLTR_ACCOUNT_TEST,,,,,,false,20
-cgrates.org,ATTR_PPPOE_TEST,,,,,*cgrep.PasswordFromAttributes,*constant,test,,
+cgrates.org,ATTR_PPPOE_TEST,,,,,*req.Password,*constant,test,,
 cgrates.org,ATTR_PPPOE_TEST,,,,,*req.RequestType,*constant,*prepaid,,
 cgrates.org,ATTR_PPPOE_TEST,,,,,*req.MikrotikRateLimit,*constant,10M/10M,,
 
 # User: pppoe_user1 - 10Mbps plan with static IP
 cgrates.org,ATTR_PPPOE_USER1,*any,FLTR_ACCOUNT_USER1,,,,,,false,20
-cgrates.org,ATTR_PPPOE_USER1,,,,,*cgrep.PasswordFromAttributes,*constant,SecurePass123,,
+cgrates.org,ATTR_PPPOE_USER1,,,,,*req.Password,*constant,SecurePass123,,
 cgrates.org,ATTR_PPPOE_USER1,,,,,*req.RequestType,*constant,*prepaid,,
 cgrates.org,ATTR_PPPOE_USER1,,,,,*req.FramedIPAddress,*constant,10.0.0.101,,
 cgrates.org,ATTR_PPPOE_USER1,,,,,*req.FramedIPNetmask,*constant,255.255.255.0,,
@@ -17,7 +17,7 @@ cgrates.org,ATTR_PPPOE_USER1,,,,,*req.MikrotikRateLimit,*constant,10M/10M,,
 
 # User: pppoe_user2 - 20Mbps plan with static IP
 cgrates.org,ATTR_PPPOE_USER2,*any,FLTR_ACCOUNT_USER2,,,,,,false,20
-cgrates.org,ATTR_PPPOE_USER2,,,,,*cgrep.PasswordFromAttributes,*constant,SecurePass456,,
+cgrates.org,ATTR_PPPOE_USER2,,,,,*req.Password,*constant,SecurePass456,,
 cgrates.org,ATTR_PPPOE_USER2,,,,,*req.RequestType,*constant,*prepaid,,
 cgrates.org,ATTR_PPPOE_USER2,,,,,*req.FramedIPAddress,*constant,10.0.0.102,,
 cgrates.org,ATTR_PPPOE_USER2,,,,,*req.FramedIPNetmask,*constant,255.255.255.0,,
@@ -25,6 +25,6 @@ cgrates.org,ATTR_PPPOE_USER2,,,,,*req.MikrotikRateLimit,*constant,20M/20M,,
 
 # User: pppoe_user3 - 50Mbps plan with dynamic IP
 cgrates.org,ATTR_PPPOE_USER3,*any,FLTR_ACCOUNT_USER3,,,,,,false,20
-cgrates.org,ATTR_PPPOE_USER3,,,,,*cgrep.PasswordFromAttributes,*constant,SecurePass789,,
+cgrates.org,ATTR_PPPOE_USER3,,,,,*req.Password,*constant,SecurePass789,,
 cgrates.org,ATTR_PPPOE_USER3,,,,,*req.RequestType,*constant,*prepaid,,
 cgrates.org,ATTR_PPPOE_USER3,,,,,*req.MikrotikRateLimit,*constant,50M/50M,,