diff --git a/src/Sql/dbo/Vault/Functions/CipherDetails.sql b/src/Sql/dbo/Vault/Functions/CipherDetails.sql
index 30c0995b67..9d041d36d1 100644
--- a/src/Sql/dbo/Vault/Functions/CipherDetails.sql
+++ b/src/Sql/dbo/Vault/Functions/CipherDetails.sql
@@ -27,6 +27,6 @@ SELECT
     END [FolderId],
     C.[DeletedDate],
     C.[Reprompt],
-    C.[Key],
+    C.[Key]
 FROM
     [dbo].[Cipher] C
diff --git a/src/Sql/dbo/Vault/Functions/UserCipherDetails.sql b/src/Sql/dbo/Vault/Functions/UserCipherDetails.sql
index e7933572cd..7547d6e42b 100644
--- a/src/Sql/dbo/Vault/Functions/UserCipherDetails.sql
+++ b/src/Sql/dbo/Vault/Functions/UserCipherDetails.sql
@@ -12,7 +12,19 @@ WITH [CTE] AS (
         AND [Status] = 2 -- Confirmed
 )
 SELECT
-    C.*,
+    C.Id,
+    C.UserId,
+    C.OrganizationId,
+    C.Type,
+    C.Data,
+    C.Attachments,
+    C.CreationDate,
+    C.RevisionDate,
+    C.Favorite,
+    C.FolderId,
+    C.DeletedDate,
+    C.Reprompt,
+    C.Key,
     CASE
         WHEN COALESCE(CU.[ReadOnly], CG.[ReadOnly], 0) = 0
         THEN 1
@@ -56,7 +68,19 @@ WHERE
 UNION ALL
 
 SELECT
-    *,
+    C.Id,
+    C.UserId,
+    C.OrganizationId,
+    C.Type,
+    C.Data,
+    C.Attachments,
+    C.CreationDate,
+    C.RevisionDate,
+    C.Favorite,
+    C.FolderId,
+    C.DeletedDate,
+    C.Reprompt,
+    C.Key,
     1 [Edit],
     1 [ViewPassword],
     1 [Manage],
diff --git a/src/Sql/dbo/Vault/Stored Procedures/Cipher/Cipher_Unarchive.sql b/src/Sql/dbo/Vault/Stored Procedures/Cipher/Cipher_Unarchive.sql
index 4b9f30fdfa..d80442bd08 100644
--- a/src/Sql/dbo/Vault/Stored Procedures/Cipher/Cipher_Unarchive.sql	
+++ b/src/Sql/dbo/Vault/Stored Procedures/Cipher/Cipher_Unarchive.sql	
@@ -10,7 +10,7 @@ BEGIN
     DELETE Ca
     FROM [dbo].[CipherArchive] Ca
     INNER JOIN @Ids I ON Ca.CipherId = I.[Id]
-    WHERE Ca.UserId = @UserId
+    WHERE Ca.UserId = @UserId;
 
     EXEC [dbo].[User_BumpAccountRevisionDate] @UserId