diff --git a/backend/app/classes/SettingsManager.py b/backend/app/classes/SettingsManager.py
index 84d9e94ba..5ec1363b4 100644
--- a/backend/app/classes/SettingsManager.py
+++ b/backend/app/classes/SettingsManager.py
@@ -42,7 +42,7 @@ class SettingsManager(metaclass=Singleton):
         "ip": "",
         "gateway": "",
         "netmask": "",
-        "hostname": "",
+        "hostname": "Chameleon-Vision",
         "curr_camera": "",
         "curr_pipeline": ""
     }
@@ -188,7 +188,7 @@ class SettingsManager(metaclass=Singleton):
 
     def change_general_settings_values(self, dic):
         for key in dic['change_general_settings_values']:
-            if self.default_general_settings[key]:
+            if key in self.default_general_settings.keys():
                 self.general_settings[key] = dic['change_general_settings_values'][key]
         self.save_settings()
 
diff --git a/backend/app/handlers/IPHandler.py b/backend/app/handlers/IPHandler.py
index b5cce0044..dee105418 100644
--- a/backend/app/handlers/IPHandler.py
+++ b/backend/app/handlers/IPHandler.py
@@ -39,4 +39,4 @@ class ChangeIP:
 
     @staticmethod
     def change_hostname(hostname):
-        subprocess.call(['hostnamectl', 'set-hostname', "Chameleon-Vision-" + hostname])
+        subprocess.call(['hostnamectl set-hostname', hostname])