diff --git a/src/Sql/dbo/Functions/UserCipherDetails.sql b/src/Sql/dbo/Functions/UserCipherDetails.sql
index 69ff05310..2c19246a2 100644
--- a/src/Sql/dbo/Functions/UserCipherDetails.sql
+++ b/src/Sql/dbo/Functions/UserCipherDetails.sql
@@ -33,7 +33,7 @@ FROM
 INNER JOIN
     [CTE] OU ON C.[UserId] IS NULL AND C.[OrganizationId] IN (SELECT [OrganizationId] FROM [CTE])
 INNER JOIN
-    [dbo].[Organization] O ON O.[Id] = OU.OrganizationId AND O.[Id] = C.[OrganizationId] AND O.[Enabled] = 1
+    [dbo].[Organization] O ON O.[Id] = OU.[OrganizationId] AND O.[Id] = C.[OrganizationId] AND O.[Enabled] = 1
 LEFT JOIN
     [dbo].[CollectionCipher] CC ON OU.[AccessAll] = 0 AND CC.[CipherId] = C.[Id]
 LEFT JOIN
diff --git a/src/Sql/dbo/Stored Procedures/Folder_DeleteById.sql b/src/Sql/dbo/Stored Procedures/Folder_DeleteById.sql
index 60141a042..2c005a403 100644
--- a/src/Sql/dbo/Stored Procedures/Folder_DeleteById.sql	
+++ b/src/Sql/dbo/Stored Procedures/Folder_DeleteById.sql	
@@ -7,30 +7,56 @@ BEGIN
     DECLARE @UserId UNIQUEIDENTIFIER = (SELECT TOP 1 [UserId] FROM [dbo].[Folder] WHERE [Id] = @Id)
     DECLARE @UserIdPath VARCHAR(50) = CONCAT('$."', @UserId, '"')
 
+    ;WITH [CTE] AS (
+        SELECT
+            [Id],
+            [OrganizationId],
+            [AccessAll]
+        FROM
+            [OrganizationUser]
+        WHERE
+            [UserId] = @UserId
+            AND [Status] = 2 -- Confirmed
+    )
     UPDATE
         C
     SET
         C.[Folders] = JSON_MODIFY(C.[Folders], @UserIdPath, NULL)
     FROM
         [dbo].[Cipher] C
+    INNER JOIN
+        [CTE] OU ON C.[UserId] IS NULL AND C.[OrganizationId] IN (SELECT [OrganizationId] FROM [CTE])
+    INNER JOIN
+        [dbo].[Organization] O ON O.[Id] = OU.[OrganizationId] AND O.[Id] = C.[OrganizationId] AND O.[Enabled] = 1
     LEFT JOIN
-        [dbo].[Organization] O ON C.[UserId] IS NULL AND O.[Id] = C.[OrganizationId]
-    LEFT JOIN
-        [dbo].[OrganizationUser] OU ON OU.[OrganizationId] = O.[Id] AND OU.[UserId] = @UserId
-    LEFT JOIN
-        [dbo].[CollectionCipher] CC ON C.[UserId] IS NULL AND OU.[AccessAll] = 0 AND CC.[CipherId] = C.[Id]
+        [dbo].[CollectionCipher] CC ON OU.[AccessAll] = 0 AND CC.[CipherId] = C.[Id]
     LEFT JOIN
         [dbo].[CollectionUser] CU ON CU.[CollectionId] = CC.[CollectionId] AND CU.[OrganizationUserId] = OU.[Id]
+    LEFT JOIN
+        [dbo].[GroupUser] GU ON CU.[CollectionId] IS NULL AND OU.[AccessAll] = 0 AND GU.[OrganizationUserId] = OU.[Id]
+    LEFT JOIN
+        [dbo].[Group] G ON G.[Id] = GU.[GroupId]
+    LEFT JOIN
+        [dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[CollectionId] = CC.[CollectionId] AND CG.[GroupId] = GU.[GroupId]
     WHERE
         (
-            C.[UserId] = @UserId
-            OR (
-                C.[UserId] IS NULL
-                AND (OU.[AccessAll] = 1 OR CU.[CollectionId] IS NOT NULL)
-            )
+            OU.[AccessAll] = 1
+            OR CU.[CollectionId] IS NOT NULL
+            OR G.[AccessAll] = 1
+            OR CG.[CollectionId] IS NOT NULL
         )
         AND JSON_VALUE(C.[Folders], @UserIdPath) = @Id
 
+    UPDATE
+        C
+    SET
+        C.[Folders] = JSON_MODIFY(C.[Folders], @UserIdPath, NULL)
+    FROM
+        [dbo].[Cipher] C
+    WHERE
+        [UserId] = @UserId
+        AND JSON_VALUE([Folders], @UserIdPath) = @Id
+
     DELETE
     FROM
         [dbo].[Folder]
diff --git a/src/Sql/dbo/Tables/Device.sql b/src/Sql/dbo/Tables/Device.sql
index a274521de..9f8d515cc 100644
--- a/src/Sql/dbo/Tables/Device.sql
+++ b/src/Sql/dbo/Tables/Device.sql
@@ -16,3 +16,8 @@ GO
 CREATE UNIQUE NONCLUSTERED INDEX [UX_Device_UserId_Identifier]
     ON [dbo].[Device]([UserId] ASC, [Identifier] ASC);
 
+
+GO
+CREATE NONCLUSTERED INDEX [IX_Device_Identifier]
+    ON [dbo].[Device]([Identifier] ASC);
+
diff --git a/util/Setup/DbScripts/2018-06-11_00_WebVaultUpdates.sql b/util/Setup/DbScripts/2018-06-11_00_WebVaultUpdates.sql
index 2b469e0a1..165ebf490 100644
--- a/util/Setup/DbScripts/2018-06-11_00_WebVaultUpdates.sql
+++ b/util/Setup/DbScripts/2018-06-11_00_WebVaultUpdates.sql
@@ -47,6 +47,16 @@ BEGIN
 END
 GO
 
+IF NOT EXISTS (
+    SELECT * FROM sys.indexes  WHERE [Name]='IX_Device_Identifier'
+    AND object_id = OBJECT_ID('[dbo].[Device]')
+)
+BEGIN
+    CREATE NONCLUSTERED INDEX [IX_Device_Identifier]
+        ON [dbo].[Device]([Identifier] ASC)
+END
+GO
+
 IF EXISTS(SELECT * FROM sys.views WHERE [Name] = 'UserView')
 BEGIN
     DROP VIEW [dbo].[UserView]
@@ -580,3 +590,78 @@ BEGIN
     EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
 END
 GO
+
+IF OBJECT_ID('[dbo].[Folder_DeleteById]') IS NOT NULL
+BEGIN
+    DROP PROCEDURE [dbo].[Folder_DeleteById]
+END
+GO
+
+CREATE PROCEDURE [dbo].[Folder_DeleteById]
+    @Id UNIQUEIDENTIFIER
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    DECLARE @UserId UNIQUEIDENTIFIER = (SELECT TOP 1 [UserId] FROM [dbo].[Folder] WHERE [Id] = @Id)
+    DECLARE @UserIdPath VARCHAR(50) = CONCAT('$."', @UserId, '"')
+
+    ;WITH [CTE] AS (
+        SELECT
+            [Id],
+            [OrganizationId],
+            [AccessAll]
+        FROM
+            [OrganizationUser]
+        WHERE
+            [UserId] = @UserId
+            AND [Status] = 2 -- Confirmed
+    )
+    UPDATE
+        C
+    SET
+        C.[Folders] = JSON_MODIFY(C.[Folders], @UserIdPath, NULL)
+    FROM
+        [dbo].[Cipher] C
+    INNER JOIN
+        [CTE] OU ON C.[UserId] IS NULL AND C.[OrganizationId] IN (SELECT [OrganizationId] FROM [CTE])
+    INNER JOIN
+        [dbo].[Organization] O ON O.[Id] = OU.[OrganizationId] AND O.[Id] = C.[OrganizationId] AND O.[Enabled] = 1
+    LEFT JOIN
+        [dbo].[CollectionCipher] CC ON OU.[AccessAll] = 0 AND CC.[CipherId] = C.[Id]
+    LEFT JOIN
+        [dbo].[CollectionUser] CU ON CU.[CollectionId] = CC.[CollectionId] AND CU.[OrganizationUserId] = OU.[Id]
+    LEFT JOIN
+        [dbo].[GroupUser] GU ON CU.[CollectionId] IS NULL AND OU.[AccessAll] = 0 AND GU.[OrganizationUserId] = OU.[Id]
+    LEFT JOIN
+        [dbo].[Group] G ON G.[Id] = GU.[GroupId]
+    LEFT JOIN
+        [dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[CollectionId] = CC.[CollectionId] AND CG.[GroupId] = GU.[GroupId]
+    WHERE
+        (
+            OU.[AccessAll] = 1
+            OR CU.[CollectionId] IS NOT NULL
+            OR G.[AccessAll] = 1
+            OR CG.[CollectionId] IS NOT NULL
+        )
+        AND JSON_VALUE(C.[Folders], @UserIdPath) = @Id
+
+    UPDATE
+        C
+    SET
+        C.[Folders] = JSON_MODIFY(C.[Folders], @UserIdPath, NULL)
+    FROM
+        [dbo].[Cipher] C
+    WHERE
+        [UserId] = @UserId
+        AND JSON_VALUE([Folders], @UserIdPath) = @Id
+
+    DELETE
+    FROM
+        [dbo].[Folder]
+    WHERE
+        [Id] = @Id
+
+    EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
+END
+GO