diff --git a/src/settings/backup.cpp b/src/settings/backup.cpp
index ac7cec9..a883d7c 100644
--- a/src/settings/backup.cpp
+++ b/src/settings/backup.cpp
@@ -21,17 +21,16 @@ namespace api
         void Settings::restore(const httplib::Request& request, httplib::Response& response)
         {
             const httplib::MultipartFormData& file = request.get_file_value("restore_settings");
-            if (file.content_type == JSON_TYPE) {
-                nlohmann::json new_config = nlohmann::json::parse(file.content);
-                config::config.setConfig(new_config);
-                config::config.saveConfig();
-                set_all_settings(config::config.getConfig());
-                response.set_content(R"({"status":true})", JSON_TYPE);
-                system("rc restart auth_service");
-                system("rc restart openrouter");
+            if (!file.content_type.compare(JSON_TYPE)) {
+                response.set_content(R"({"status":false})", JSON_TYPE);
                 return;
             }
-            response.set_content(R"({"status":false})", JSON_TYPE);
+            nlohmann::json new_config = nlohmann::json::parse(file.content);
+            config::config.setConfig(new_config);
+            config::config.saveConfig();
+            set_all_settings(config::config.getConfig());
+            response.set_content(R"({"status":true})", JSON_TYPE);
+            system("rc restart openrouter");
         }
 
         void Settings::restore_defaults(const httplib::Request& request, httplib::Response& response)
@@ -39,17 +38,16 @@ namespace api
             std::cout << GREEN << request.path << RESET << "  " << request.method << std::endl;
             response.set_header("Access-Control-Allow-Origin", "*");
             check_body_empty(request, response, ACCESS_REQUIRED_STRING);
-            if (std::filesystem::exists(config::config.getConfigFileName())) {
-                std::filesystem::remove(config::config.getConfigFileName());
-                std::filesystem::copy("../config_default.json", config::config.getConfigFileName());
-                config::config.setConfig(config::config.getConfigFileName());
-                set_all_settings(config::config.getConfig());
-                response.set_content(R"({"status":true})", JSON_TYPE);
-                system("rc restart auth_service");
-                system("rc restart openrouter");
+            if (!std::filesystem::exists(config::config.getConfigFileName())) {
+                response.set_content(R"({"status":false})", JSON_TYPE);
                 return;
             }
-            response.set_content(R"({"status":false})", JSON_TYPE);
+            std::filesystem::remove(config::config.getConfigFileName());
+            std::filesystem::copy("../config_default.json", config::config.getConfigFileName());
+            config::config.setConfig(config::config.getConfigFileName());
+            set_all_settings(config::config.getConfig());
+            response.set_content(R"({"status":true})", JSON_TYPE);
+            system("rc restart openrouter");
         }
     }
 }
diff --git a/src/settings/dns/enabled.cpp b/src/settings/dns/enabled.cpp
index e562e78..fee3798 100644
--- a/src/settings/dns/enabled.cpp
+++ b/src/settings/dns/enabled.cpp
@@ -14,13 +14,11 @@ namespace api
                     system("rc stop dnsmasq");
                     system("rc del dnsmasq");
                     syslog(LOG_INFO, "%s", "DNS is disabled");
+                    return;
                 }
-                else
-                {
-                    system("rc restart dnsmasq");
-                    system("rc add dnsmasq");
-                    syslog(LOG_INFO, "%s", "DNS is enabled");
-                }
+                system("rc restart dnsmasq");
+                system("rc add dnsmasq");
+                syslog(LOG_INFO, "%s", "DNS is enabled");
             }
         }
     }
diff --git a/src/settings/ftp/ftp.cpp b/src/settings/ftp/ftp.cpp
index 567b08a..689aaa7 100644
--- a/src/settings/ftp/ftp.cpp
+++ b/src/settings/ftp/ftp.cpp
@@ -17,13 +17,11 @@ namespace api
                     system("rc stop ftpd");
                     system("rc del ftpd");
                     syslog(LOG_INFO, "%s", "Ftp is disabled");
+                    return;
                 }
-                else
-                {
-                    system("rc start ftpd");
-                    system("rc add ftpd");
-                    syslog(LOG_INFO, "%s", "Ftp is enabled");
-                }
+                system("rc start ftpd");
+                system("rc add ftpd");
+                syslog(LOG_INFO, "%s", "Ftp is enabled");
             }
         }
     }
diff --git a/src/settings/ssh/status.cpp b/src/settings/ssh/status.cpp
index 5f8dd29..9205eab 100644
--- a/src/settings/ssh/status.cpp
+++ b/src/settings/ssh/status.cpp
@@ -24,20 +24,18 @@ namespace api
                         system("rc del ssh");
                     }
                     syslog(LOG_INFO, "%s", "SSH is disabled");
+                    return;
                 }
-                else
+                if (ssh_server == DROPBEAR_SSH)
                 {
-                    if (ssh_server == DROPBEAR_SSH)
-                    {
-                        system("rc start dropbear");
-                        system("rc add dropbear");
-                    }
-                    else if (ssh_server == OPENSSH_SSH) {
-                        system("rc start ssh");
-                        system("rc add ssh");
-                    }
-                    syslog(LOG_INFO, "%s", "SSH is enabled");
+                    system("rc start dropbear");
+                    system("rc add dropbear");
                 }
+                else if (ssh_server == OPENSSH_SSH) {
+                    system("rc start ssh");
+                    system("rc add ssh");
+                }
+                syslog(LOG_INFO, "%s", "SSH is enabled");
             }
         }
     }
diff --git a/src/settings/telnet/enabled.cpp b/src/settings/telnet/enabled.cpp
index 6d6b7dc..43b8bbe 100644
--- a/src/settings/telnet/enabled.cpp
+++ b/src/settings/telnet/enabled.cpp
@@ -17,13 +17,11 @@ namespace api
                     system("rc stop telnetd");
                     system("rc del telnetd");
                     syslog(LOG_INFO, "%s", "Telnet is disabled");
+                    return;
                 }
-                else
-                {
-                    system("rc start telnetd");
-                    system("rc add telnetd");
-                    syslog(LOG_INFO, "%s", "Telnet is enabled");
-                }
+                system("rc start telnetd");
+                system("rc add telnetd");
+                syslog(LOG_INFO, "%s", "Telnet is enabled");
             }
         }
     }
diff --git a/src/settings/wifi/status.cpp b/src/settings/wifi/status.cpp
index 48dc523..d2aaac8 100644
--- a/src/settings/wifi/status.cpp
+++ b/src/settings/wifi/status.cpp
@@ -16,13 +16,11 @@ namespace api
                     system("rc stop hostapd");
                     system("rc del hostapd");
                     syslog(LOG_INFO, "%s", "WIFI is disabled");
+                    return;
                 }
-                else
-                {
-                    system("rc start hostapd");
-                    system("rc add hostapd");
-                    syslog(LOG_INFO, "%s", "WIFI is enabled");
-                }
+                system("rc start hostapd");
+                system("rc add hostapd");
+                syslog(LOG_INFO, "%s", "WIFI is enabled");
             }
         }
     }