diff --git a/server/admin.api.js b/server/admin.api.js
index 625e44f22..8c29791ce 100644
--- a/server/admin.api.js
+++ b/server/admin.api.js
@@ -147,16 +147,16 @@ router.get('/admin/lock', mw.adminOnly, async (req, res)=>{
 			{
 			  $match :
 				{
-				  lock : { $exists: 1 }
+				  lock : true
 				}
 			},
 			{
-			  $count : 'count'
+			  $count :
+				'count'
 			}
 		];
 		const totalLockCount = await HomebrewModel.aggregate(countLocksPipeline);
 		const count = totalLockCount[0].count;
-		console.log(totalLockCount);
 		return res.json({
 			count
 		});
@@ -179,7 +179,7 @@ router.post('/admin/lock/:id', mw.adminOnly, async (req, res)=>{
 		brew = await HomebrewModel.findOne(filter);
 
 		if(brew.lock) {
-			console.log('ALREADY LOCKED');
+			// console.log('ALREADY LOCKED');
 			return res.json({ status: 'ALREADY LOCKED', detail: `Lock already exists on brew ${req.params.id} - ${brew.title}` });
 		}
 
@@ -191,7 +191,7 @@ router.post('/admin/lock/:id', mw.adminOnly, async (req, res)=>{
 		// console.log(`Lock applied to brew ID ${brew.shareId} - ${brew.title}`);
 	} catch (error) {
 		console.error(error);
-		return res.json({ status: 'ERROR', error, detail: `Unable to set lock on brew ${req.params.id}` });
+		return res.json({ status: 'ERROR', error, message: `Unable to set lock on brew ${req.params.id}` });
 	}
 
 	return res.json({ status: 'LOCKED', detail: `Lock applied to brew ID ${brew.shareId} - ${brew.title}`, lock });
@@ -227,6 +227,7 @@ router.get('/admin/lock/reviews', mw.adminOnly, async (req, res)=>{
 			{
 			  $match :
 				{
+				  'lock.locked'          : true,
 				  'lock.reviewRequested' : { '$exists': 1 }
 				},
 			}
@@ -255,16 +256,19 @@ router.get('/admin/lock/review/request/:id', async (req, res)=>{
 
 		if(brew.lock.reviewRequested){
 			// console.log(`Review already requested for brew ${brew.shareId} - ${brew.title}`);
-			return res.json({ status: 'ALREADY REQUESTED', detail: `Review already requested for brew ${brew.shareId} - ${brew.title}` });
+			return res.json({ status: 'NOT REQUESTED', detail: `Review already requested for brew ${brew.shareId} - ${brew.title}` });
 		};
 
 		brew.lock.reviewRequested = new Date();
 		brew.markModified('lock');
 
-		await brew.save();
+		await brew.save()
+		.catch((err)=>{
+			return err;
+		});
 
 		// console.log(`Review requested on brew ${brew.shareId} - ${brew.title}`);
-		return res.json({ status: 'REVIEW REQUESTED', detail: `Review requested for ${brew.shareId} - ${brew.title}` });
+		return res.json({ status: 'REVIEW REQUESTED', brew });
 	} catch (error) {
 		console.error(error);
 		return res.json({ status: 'ERROR', detail: `Unable to set request for review on brew ID ${req.params.id}`, error });
@@ -272,14 +276,14 @@ router.get('/admin/lock/review/request/:id', async (req, res)=>{
 });
 
 router.get('/admin/lock/review/remove/:id', mw.adminOnly, async (req, res)=>{
-	let brew;
 	try {
 		const filter = {
 			shareId                : req.params.id,
-			'lock.reviewRequested' : { $exists: 1 }
+			'lock.locked'          : true,
+			'lock.reviewRequested' : { '$exists': 1 }
 		};
 
-		brew = await HomebrewModel.findOne(filter);
+		const brew = await HomebrewModel.findOne(filter);
 		if(!brew) { return res.json({ status: 'NOT REMOVED', detail: `Brew ID ${req.params.id} does not have a review pending!` }); };
 
 		brew.lock.reviewRequested = undefined;
@@ -288,10 +292,10 @@ router.get('/admin/lock/review/remove/:id', mw.adminOnly, async (req, res)=>{
 		await brew.save();
 
 		// console.log(`Review request removed on brew ID ${brew.shareId} - ${brew.title}`);
-		return res.json({ status: 'REVIEW REQUEST REMOVED', detail: `Request for Review removed from brew ID ${brew.shareId} - ${brew.title}` });
+		return res.json(brew);
 	} catch (error) {
 		console.error(error);
-		return res.json({ status: 'ERROR', detail: `Unable to remove request for review on brew ID ${req.params.id}`, error });
+		return res.json({ error: `Unable to remove request for review on brew ID ${req.params.id}` });
 	}
 });