diff --git a/src/bootstrap/Switch.js b/src/bootstrap/Switch.js
index 29ec3f3..b862918 100644
--- a/src/bootstrap/Switch.js
+++ b/src/bootstrap/Switch.js
@@ -23,7 +23,7 @@ Switch.propTypes = {
 export function Switch({ label, helpText, switchHeading, ...props }) {
     const uid = useUID();
     return (
-        <div className="form-group switch">
+        <div className={`form-group ${switchHeading ? "switch" : ""}`}>
             <div
                 className={`custom-control custom-switch ${
                     !helpText ? "custom-control-inline" : ""
diff --git a/src/bootstrap/__tests__/__snapshots__/Switch.test.js.snap b/src/bootstrap/__tests__/__snapshots__/Switch.test.js.snap
index e0c171f..3e533aa 100644
--- a/src/bootstrap/__tests__/__snapshots__/Switch.test.js.snap
+++ b/src/bootstrap/__tests__/__snapshots__/Switch.test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`<Switch/> Render switch 1`] = `
 <div
-  class="form-group switch"
+  class="form-group "
 >
   <div
     class="custom-control custom-switch"
@@ -30,7 +30,7 @@ exports[`<Switch/> Render switch 1`] = `
 
 exports[`<Switch/> Render uncheked switch 1`] = `
 <div
-  class="form-group switch"
+  class="form-group "
 >
   <div
     class="custom-control custom-switch"
diff --git a/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap b/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap
index 60cac96..9d45f10 100644
--- a/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap
+++ b/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap
@@ -876,7 +876,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +         </select>
 +       </div>
 +       <div
-+         class=\\"form-group switch\\"
++         class=\\"form-group \\"
 +       >
 +         <div
 +           class=\\"custom-control custom-switch\\"
diff --git a/src/utils/forisUrls.js b/src/utils/forisUrls.js
index a63ab36..a1b8293 100644
--- a/src/utils/forisUrls.js
+++ b/src/utils/forisUrls.js
@@ -27,7 +27,7 @@ export const ForisURLs = {
 
     approveUpdates: "/package-management/updates",
     languages: "/package-management/languages",
-    rebootPage: "/reforis/administration/reboot",
+    rebootPage: "/administration/reboot",
     luci: "/cgi-bin/luci",
 
     // API
diff --git a/src/webSockets/WebSockets.js b/src/webSockets/WebSockets.js
index 5663948..55e3af5 100644
--- a/src/webSockets/WebSockets.js
+++ b/src/webSockets/WebSockets.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2020 CZ.NIC z.s.p.o. (http://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -12,7 +12,7 @@ import { ForisURLs } from "../utils/forisUrls";
 const PROTOCOL = window.location.protocol === "http:" ? "ws" : "wss";
 
 const URL = process.env.LIGHTTPD
-    ? `${PROTOCOL}://${window.location.hostname}/foris-ws`
+    ? `${PROTOCOL}://${window.location.host}/foris-ws`
     : `${PROTOCOL}://${window.location.hostname}:${9081}`;
 
 const WAITING_FOR_CONNECTION_TIMEOUT = 500;