diff --git a/java/src/main/java/com/logicalclocks/hsfs/StorageConnector.java b/java/src/main/java/com/logicalclocks/hsfs/StorageConnector.java
index e926136477..a9dd0ad5b2 100644
--- a/java/src/main/java/com/logicalclocks/hsfs/StorageConnector.java
+++ b/java/src/main/java/com/logicalclocks/hsfs/StorageConnector.java
@@ -24,8 +24,6 @@
 import lombok.ToString;
 
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -74,23 +72,12 @@ public class StorageConnector {
   @Setter
   private StorageConnectorType storageConnectorType;
 
-  public Map<String, String> getSparkOptions() throws FeatureStoreException {
-    List<String[]> args = Arrays.stream(arguments.split(","))
+  public Map<String, String> getSparkOptions() {
+    Map<String, String> options = Arrays.stream(arguments.split(","))
         .map(arg -> arg.split("="))
-        .collect(Collectors.toList());
+        .collect(Collectors.toMap(a -> a[0], a -> a[1]));
 
-    String user = args.stream().filter(arg -> arg[0].equalsIgnoreCase(Constants.JDBC_USER))
-        .findFirst()
-        .orElseThrow(() -> new FeatureStoreException("No user provided for storage connector"))[1];
-
-    String password = args.stream().filter(arg -> arg[0].equalsIgnoreCase(Constants.JDBC_PWD))
-        .findFirst()
-        .orElseThrow(() -> new FeatureStoreException("No password provided for storage connector"))[1];
-
-    Map<String, String> options = new HashMap<>();
     options.put(Constants.JDBC_URL, connectionString);
-    options.put(Constants.JDBC_USER, user);
-    options.put(Constants.JDBC_PWD, password);
     return options;
   }
 }
diff --git a/python/hsfs/storage_connector.py b/python/hsfs/storage_connector.py
index 117615d5b7..bfb604009c 100644
--- a/python/hsfs/storage_connector.py
+++ b/python/hsfs/storage_connector.py
@@ -114,9 +114,7 @@ def spark_options(self):
         arguments.
         """
         args = [arg.split("=") for arg in self._arguments.split(",")]
+        options = {a[0]: a[1] for a in args}
+        options["url"] = self._connection_string
 
-        return {
-            "url": self._connection_string,
-            "user": [arg[1] for arg in args if arg[0] == "user"][0],
-            "password": [arg[1] for arg in args if arg[0] == "password"][0],
-        }
+        return options