diff --git a/app/controllers/donor/grant.controller.js b/app/controllers/donor/grant.controller.js
index 8b8ef66..24f9c41 100644
--- a/app/controllers/donor/grant.controller.js
+++ b/app/controllers/donor/grant.controller.js
@@ -34,9 +34,11 @@ exports.create = (req, res, next) => {
 
 // Find grants with causes, regions, and organizations by donor_id
 exports.findByDonorId = (req, res, next) => {
+	const donor_id = req.user_data.id;
+
 	Grant.findAll({
 		where: {
-			donor_id: req.params.donor_id
+			donor_id: donor_id
 		},
 		include: [Cause, Region, Organization]
 	})
diff --git a/app/middleware/check-auth.js b/app/middleware/check-auth.js
index fd4e5de..38211ab 100644
--- a/app/middleware/check-auth.js
+++ b/app/middleware/check-auth.js
@@ -5,10 +5,12 @@ module.exports = (req, res, next) => {
 	try {
 		const token = req.headers.authorization.split(' ')[1];
 		const decoded = jwt.verify(token, process.env.JWT_KEY);
-		req.userData = decoded; //for use till end of request
+		req.user_data = decoded; //for use till end of request
 
 		next();
 	} catch (error) {
+		error.message = 'Check Auth Error';
+		error.status = 401;
 		return next(error);
 	}
 };
diff --git a/app/routes/donor.route.js b/app/routes/donor.route.js
index 9dec5d8..ad16957 100644
--- a/app/routes/donor.route.js
+++ b/app/routes/donor.route.js
@@ -11,7 +11,7 @@ router.post('/', controllers.donor.create);
 router.get('/', checkAuth, controllers.donor.findAll);
 
 // GET Retrieve grants with causes and regions and charities details by donor_id
-router.get('/grants/:donor_id', checkAuth, controllers.grant.findByDonorId);
+router.get('/grants/', checkAuth, controllers.grant.findByDonorId);
 
 /** POST Create grants with following body:
  * - list of id's of selected causes and regions