diff --git a/repertory/repertory/src/ui/handlers.cpp b/repertory/repertory/src/ui/handlers.cpp
index d8806833..79e59124 100644
--- a/repertory/repertory/src/ui/handlers.cpp
+++ b/repertory/repertory/src/ui/handlers.cpp
@@ -71,6 +71,29 @@ namespace {
       std::next(buffer.begin(), static_cast<std::int64_t>(size)));
 }
 
+[[nodiscard]] auto decrypt_value(const repertory::ui::mgmt_app_config *config,
+                                 std::string_view key, std::string_view value,
+                                 bool &skip) -> std::string {
+  auto last_key{key};
+  auto parts = repertory::utils::string::split(key, '.', false);
+  if (parts.size() > 1U) {
+    last_key = parts.at(parts.size() - 1U);
+  }
+
+  if (last_key == repertory::JSON_API_PASSWORD ||
+      last_key == repertory::JSON_ENCRYPTION_TOKEN ||
+      last_key == repertory::JSON_SECRET_KEY) {
+    auto decrypted = decrypt(value, config->get_api_password());
+    if (decrypted.empty()) {
+      skip = true;
+    }
+
+    return decrypted;
+  }
+
+  return std::string{value};
+}
+
 [[nodiscard]] constexpr auto is_restricted(std::string_view data) -> bool {
   constexpr std::string_view invalid_chars = "&;|><$()`{}!*?";
   return data.find_first_of(invalid_chars) != std::string_view::npos;
@@ -376,16 +399,35 @@ void handlers::handle_post_add_mount(auto &&req, auto &&res) const {
 
   auto cfg = nlohmann::json::parse(req.get_param_value("config"));
 
-  launch_process(prov, name, "-gc");
+  std::map<std::string, std::string> values{};
   for (const auto &[key, value] : cfg.items()) {
     if (value.is_object()) {
       for (const auto &[key2, value2] : value.items()) {
-        set_key_value(prov, name, fmt::format("{}.{}", key, key2),
-                      value2.template get<std::string>());
+        auto subKey = fmt::format("{}.{}", key, key2);
+        auto skip{false};
+        auto decrypted = decrypt_value(
+            config_, subKey, value2.template get<std::string>(), skip);
+        if (skip) {
+          continue;
+        }
+        values[subKey] = decrypted;
       }
-    } else {
-      set_key_value(prov, name, key, value.template get<std::string>());
+
+      continue;
     }
+
+    auto skip{false};
+    auto decrypted =
+        decrypt_value(config_, key, value.template get<std::string>(), skip);
+    if (skip) {
+      continue;
+    }
+    values[key] = decrypted;
+  }
+
+  launch_process(prov, name, "-gc");
+  for (auto &[key, value] : values) {
+    set_key_value(prov, name, key, value);
   }
 
   res.status = http_error_codes::ok;
@@ -433,25 +475,14 @@ void handlers::handle_put_set_value_by_name(auto &&req, auto &&res) const {
   }
 
   auto key = req.get_param_value("key");
-  auto last_key{key};
   auto value = req.get_param_value("value");
 
-  auto parts = utils::string::split(key, '.', false);
-  if (parts.size() > 1U) {
-    last_key = parts.at(parts.size() - 1U);
+  auto skip{false};
+  value = decrypt_value(config_, key, value, skip);
+  if (not skip) {
+    set_key_value(prov, name, key, value);
   }
 
-  if (last_key == JSON_API_PASSWORD || last_key == JSON_ENCRYPTION_TOKEN ||
-      last_key == JSON_SECRET_KEY) {
-    value = decrypt(value, config_->get_api_password());
-    if (value.empty()) {
-      res.status = http_error_codes::ok;
-      return;
-    }
-  }
-
-  set_key_value(prov, name, key, value);
-
   res.status = http_error_codes::ok;
 }
 
diff --git a/web/repertory/lib/helpers.dart b/web/repertory/lib/helpers.dart
index 39105c90..3935ecd1 100644
--- a/web/repertory/lib/helpers.dart
+++ b/web/repertory/lib/helpers.dart
@@ -1,5 +1,3 @@
-import 'dart:convert';
-
 import 'package:convert/convert.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
diff --git a/web/repertory/lib/models/mount_list.dart b/web/repertory/lib/models/mount_list.dart
index b05ca1a7..7276aac0 100644
--- a/web/repertory/lib/models/mount_list.dart
+++ b/web/repertory/lib/models/mount_list.dart
@@ -88,25 +88,58 @@ class MountList with ChangeNotifier {
     });
   }
 
-  Future<void> add(
+  Future<bool> add(
     String type,
     String name,
     Map<String, dynamic> mountConfig,
   ) async {
+    var ret = false;
+
+    displayError() {
+      if (constants.navigatorKey.currentContext == null) {
+        return;
+      }
+
+      displayErrorMessage(
+        constants.navigatorKey.currentContext!,
+        'Add mount failed. Please try again.',
+      );
+    }
+
     try {
       final map = await convertAllToString(mountConfig);
-      await http.post(
+      final response = await http.post(
         Uri.parse(
           Uri.encodeFull(
             '${getBaseUri()}/api/v1/add_mount?name=$name&type=$type&config=${jsonEncode(map)}',
           ),
         ),
       );
+
+      switch (response.statusCode) {
+        case 200:
+          ret = true;
+          break;
+        case 404:
+          reset();
+          break;
+        case 500:
+          displayAuthError();
+          break;
+        default:
+          displayError();
+          break;
+      }
     } catch (e) {
       debugPrint('$e');
+      displayError();
     }
 
-    return _fetch();
+    if (ret) {
+      await _fetch();
+    }
+
+    return ret;
   }
 
   Future<void> reset() async {
@@ -126,10 +159,4 @@ class MountList with ChangeNotifier {
 
     return _fetch();
   }
-
-  void remove(String name) {
-    _mountList.removeWhere((item) => item.name == name);
-
-    notifyListeners();
-  }
 }
diff --git a/web/repertory/lib/screens/add_mount_screen.dart b/web/repertory/lib/screens/add_mount_screen.dart
index 9a64b911..2fff8574 100644
--- a/web/repertory/lib/screens/add_mount_screen.dart
+++ b/web/repertory/lib/screens/add_mount_screen.dart
@@ -164,7 +164,7 @@ class _AddMountScreenState extends State<AddMountScreen> {
                         }
                       }
 
-                      await mountList.add(
+                      final success = await mountList.add(
                         _mountType,
                         _mountType == 'Remote'
                             ? '${_settings[_mountType]!['RemoteConfig']['HostNameOrIp']}_${_settings[_mountType]!['RemoteConfig']['ApiPort']}'
@@ -172,9 +172,10 @@ class _AddMountScreenState extends State<AddMountScreen> {
                         _settings[_mountType]!,
                       );
 
-                      if (!context.mounted) {
+                      if (!success || !context.mounted) {
                         return;
                       }
+
                       Navigator.pop(context);
                     },
                     label: const Text('Add'),