diff --git a/QueryTemplates/Common Scripts/list-all-orphan-users.sql b/QueryTemplates/Common Scripts/list-all-orphan-users.sql
index ce689a2..5d7f175 100644
--- a/QueryTemplates/Common Scripts/list-all-orphan-users.sql	
+++ b/QueryTemplates/Common Scripts/list-all-orphan-users.sql	
@@ -46,5 +46,5 @@ CLOSE cur_users;
 DEALLOCATE cur_users;
 
 DROP TABLE #ADinfo;
-SELECT 'DROP USER ' + username, * FROM #OrphanUsers;
+SELECT 'USE [' + DB_NAME() + ']; DROP USER [' + username + '];', * FROM #OrphanUsers;
 DROP TABLE #OrphanUsers;