diff --git a/src/ResourceManager/DataLakeStore/ChangeLog.md b/src/ResourceManager/DataLakeStore/ChangeLog.md
index 967a3738ea58..19a667ba2286 100644
--- a/src/ResourceManager/DataLakeStore/ChangeLog.md
+++ b/src/ResourceManager/DataLakeStore/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix for issue: https://github.com/Azure/azure-powershell/issues/4323
 
 ## Version 4.2.1
 
diff --git a/src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Models/DataLakeStoreClient.cs b/src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Models/DataLakeStoreClient.cs
index 0df66184a11c..ccc64788cce7 100644
--- a/src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Models/DataLakeStoreClient.cs
+++ b/src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Models/DataLakeStoreClient.cs
@@ -114,12 +114,6 @@ public DataLakeStoreAccount CreateAccount(
 
             var toReturn = _client.Account.Create(resourceGroupName, accountName, parameters);
 
-            // enable the key vault for the user so they don't have to run an additional command.
-            if (encryptionType.HasValue && encryptionType.Value == EncryptionConfigType.UserManaged)
-            {
-                this.EnableKeyVault(resourceGroupName, accountName);
-            }
-
             return toReturn;
         }
 
@@ -158,12 +152,6 @@ public DataLakeStoreAccount UpdateAccount(
 
             var toReturn = _client.Account.Update(resourceGroupName, accountName, parameters);
 
-            // auto enable the key vault for the user if they updated it.
-            if (userConfig != null)
-            {
-                this.EnableKeyVault(resourceGroupName, accountName);
-            }
-
             return toReturn;
         }