diff --git a/util/Setup/DbScripts/2018-02-28_00_LoginUris.sql b/util/Setup/DbScripts/2018-02-28_00_LoginUris.sql
index 5224c47d9d..a143425623 100644
--- a/util/Setup/DbScripts/2018-02-28_00_LoginUris.sql
+++ b/util/Setup/DbScripts/2018-02-28_00_LoginUris.sql
@@ -10,11 +10,7 @@
     "Name":"2.xx",
     "Username":"2.zz",
     "Password":"2.aa",
-    "Uris": [
-        {
-            "Uri": "2.yy"
-        }
-    ]
+    "Uris":[{"Uri": "2.yy"}]
 }
 */
 
@@ -54,14 +50,14 @@ BEGIN
     UPDATE
         [CTE]
     SET
-        [Data] = CAST(JSON_MODIFY(
+        [Data] = JSON_MODIFY(
             [Data],
             @UrisPath,
-            CAST(JSON_QUERY(
-                '[{"Uri":"' + CAST(JSON_VALUE([Data], @UriPath) AS VARCHAR(MAX)) + '"}]',
+            JSON_QUERY(
+                '[{"Uri":"' + CAST(JSON_VALUE([Data], @UriPath) AS NVARCHAR(MAX)) + '"}]',
                 '$'
-            ) AS VARCHAR(MAX))
-        ) AS VARCHAR(MAX))
+            )
+        )
     OUTPUT INSERTED.[Id] INTO [CompletedIds]
 
     SET @BatchSize = @@ROWCOUNT
diff --git a/util/Setup/DbScripts/2018-03-12_00_FixLoginUris.sql b/util/Setup/DbScripts/2018-03-12_00_FixLoginUris.sql
new file mode 100644
index 0000000000..bf2662ddd3
--- /dev/null
+++ b/util/Setup/DbScripts/2018-03-12_00_FixLoginUris.sql
@@ -0,0 +1,32 @@
+/*
+{
+    "Name":"2.xx",
+    "Username":"2.zz",
+    "Password":"2.aa",
+    "Uris":"[{\"Uri\":\"2.yy\"}]"
+}
+=>
+{
+    "Name":"2.xx",
+    "Username":"2.zz",
+    "Password":"2.aa",
+    "Uris":[{"Uri": "2.yy"}]
+}
+*/
+
+DECLARE @UrisPath VARCHAR(50) = '$.Uris'
+
+UPDATE
+    [dbo].[Cipher]
+SET
+    [Data] = JSON_MODIFY(
+        [Data],
+        @UrisPath,
+        JSON_QUERY(
+            JSON_VALUE([Data], @UrisPath),
+            '$'
+        )
+    )
+WHERE
+    LEFT(JSON_VALUE([Data], @UrisPath), 8) = '[{"Uri":'
+GO
diff --git a/util/Setup/Setup.csproj b/util/Setup/Setup.csproj
index 73c2104d2b..e8e8dc5c8f 100644
--- a/util/Setup/Setup.csproj
+++ b/util/Setup/Setup.csproj
@@ -9,9 +9,11 @@
 
   <ItemGroup>
     <None Remove="DbScripts\2018-02-28_00_LoginUris.sql" />
+    <None Remove="DbScripts\2018-03-12_00_FixLoginUris.sql" />
   </ItemGroup>
 
   <ItemGroup>
+    <EmbeddedResource Include="DbScripts\2018-03-12_00_FixLoginUris.sql" />
     <EmbeddedResource Include="DbScripts\2018-02-28_00_LoginUris.sql" />
     <EmbeddedResource Include="DbScripts\2017-12-12_00_Events.sql" />
     <EmbeddedResource Include="DbScripts\2017-11-24_00_UpdateProcs.sql" />