diff --git a/monkey/monkey_island/cc/services/config.py b/monkey/monkey_island/cc/services/config.py
index 9f61195f5..8434a41dd 100644
--- a/monkey/monkey_island/cc/services/config.py
+++ b/monkey/monkey_island/cc/services/config.py
@@ -649,19 +649,19 @@ SCHEMA = {
                             'title': 'AWS account ID',
                             'type': 'string',
                             'description': 'Your AWS account ID that is subscribed to security hub feeds',
-                            'default': " "
+                            'default': ""
                         },
                         'aws_access_key_id': {
                             'title': 'AWS access key ID',
                             'type': 'string',
                             'description': 'Your AWS public access key ID, can be found in the IAM user interface in the AWS console.',
-                            'default': " "
+                            'default': ""
                         },
                         'aws_secret_access_key': {
                             'title': 'AWS secret access key',
                             'type': 'string',
                             'description': 'Your AWS secret access key id, you can get this after creating a public access key in the console.',
-                            'default': " "
+                            'default': ""
                         }
                     }
                 }
@@ -1107,11 +1107,15 @@ class ConfigService:
         ConfigService._encrypt_or_decrypt_config(config, False)
 
     @staticmethod
-    def decrypt_flat_config(flat_config):
+    def decrypt_flat_config(flat_config, is_island=False):
         """
         Same as decrypt_config but for a flat configuration
         """
-        keys = [config_arr_as_array[2] for config_arr_as_array in (ENCRYPTED_CONFIG_ARRAYS + ENCRYPTED_CONFIG_STRINGS)]
+        if is_island:
+            keys = [config_arr_as_array[2] for config_arr_as_array in
+                    (ENCRYPTED_CONFIG_ARRAYS + ENCRYPTED_CONFIG_STRINGS)]
+        else:
+            keys = [config_arr_as_array[2] for config_arr_as_array in ENCRYPTED_CONFIG_ARRAYS]
         for key in keys:
             if isinstance(flat_config[key], collections.Sequence) and not isinstance(flat_config[key], string_types):
                 # Check if we are decrypting ssh key pair
diff --git a/monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js b/monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js
index 6cc7e009a..ed8258197 100644
--- a/monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js
@@ -44,7 +44,7 @@ class ConfigurePageComponent extends AuthComponent {
   onSubmit = ({formData}) => {
     this.currentFormData = formData;
     this.updateConfigSection();
-    this.authFetch('/api/configuration',
+    this.authFetch('/api/configuration/island',
       {
         method: 'POST',
         headers: {'Content-Type': 'application/json'},