diff --git a/src/lang/en_US.lang.php b/src/lang/en_US.lang.php
index 3c461c14..8ef4791a 100644
--- a/src/lang/en_US.lang.php
+++ b/src/lang/en_US.lang.php
@@ -281,6 +281,7 @@ $sm_lang = array(
     ),
     'config' => array(
         'general' => 'General',
+        'site_title' => 'Site title',
         'language' => 'Language',
         'show_update' => 'Check for updates?',
         'password_encrypt_key' => 'The encryption key password',
diff --git a/src/lang/nl_NL.lang.php b/src/lang/nl_NL.lang.php
index 7ca106a4..7edae458 100644
--- a/src/lang/nl_NL.lang.php
+++ b/src/lang/nl_NL.lang.php
@@ -244,6 +244,7 @@ $sm_lang = array(
     ),
     'config' => array(
         'general' => 'Algemeen',
+        'site_title' => 'Website titel',
         'language' => 'Taal',
         'show_update' => 'Controleer wekelijks voor updates?',
         'email_status' => 'Sta email berichten toe?',
diff --git a/src/lang/pl_PL.lang.php b/src/lang/pl_PL.lang.php
index d5061f0d..d2366321 100644
--- a/src/lang/pl_PL.lang.php
+++ b/src/lang/pl_PL.lang.php
@@ -191,6 +191,7 @@ $sm_lang = array(
     ),
     'config' => array(
         'general' => 'Ogólne',
+        'site_title' => 'Tytuł strony',
         'language' => 'Język',
         'show_update' => 'Sprawdzić aktualizacje?',
         'email_status' => 'Pozwól na wysyłkę email',
diff --git a/src/psm/Module/AbstractController.php b/src/psm/Module/AbstractController.php
index 260543e6..284a0fef 100644
--- a/src/psm/Module/AbstractController.php
+++ b/src/psm/Module/AbstractController.php
@@ -217,7 +217,7 @@ abstract class AbstractController implements ControllerInterface
         if (!$this->xhr) {
             // in XHR mode, we will not add the main template
             $tpl_data = array(
-                'title' => strtoupper(psm_get_lang('system', 'title')),
+                'title' => psm_get_conf('site_title', strtoupper(psm_get_lang('system', 'title'))),
                 'label_back_to_top' => psm_get_lang('system', 'back_to_top'),
                 'add_footer' => $this->add_footer,
                 'version' => 'v' . PSM_VERSION,
diff --git a/src/psm/Module/Config/Controller/ConfigController.php b/src/psm/Module/Config/Controller/ConfigController.php
index 01216e2a..373a45de 100644
--- a/src/psm/Module/Config/Controller/ConfigController.php
+++ b/src/psm/Module/Config/Controller/ConfigController.php
@@ -77,7 +77,8 @@ class ConfigController extends AbstractController
         'jabber_host',
         'jabber_port',
         'jabber_username',
-        'jabber_domain'
+        'jabber_domain',
+        'site_title'
     );
 
     /**
@@ -191,6 +192,10 @@ class ConfigController extends AbstractController
         foreach ($this->fields as $input_key) {
             $tpl_data[$input_key] = (isset($config[$input_key])) ? $config[$input_key] : '';
         }
+
+        $tpl_data['site_title'] = empty($tpl_data['site_title']) ?
+            strtoupper(psm_get_lang('system', 'title')) : $tpl_data['site_title'];
+
         // encrypted fields
         foreach ($this->encryptedFields as $encryptedField) {
             $tpl_data[$encryptedField] = '';
@@ -224,6 +229,7 @@ class ConfigController extends AbstractController
             // save new config
             $clean = array(
                 'language' => $_POST['language'],
+                'site_title' => $_POST['site_title'],
                 'sms_gateway' => $_POST['sms_gateway'],
                 'alert_type' => $_POST['alert_type'],
                 'email_smtp_security' =>
@@ -516,7 +522,7 @@ class ConfigController extends AbstractController
             'label_log_retention_days' => psm_get_lang('config', 'log_retention_days'),
             'label_days' => psm_get_lang('config', 'log_retention_days'),
             'label_leave_blank' => psm_get_lang('users', 'password_leave_blank'),
-
+            'label_site_title' => psm_get_lang('config', 'site_title'),
         );
     }
 }
diff --git a/src/psm/Util/Module/Modal.php b/src/psm/Util/Module/Modal.php
index fba72822..21176096 100644
--- a/src/psm/Util/Module/Modal.php
+++ b/src/psm/Util/Module/Modal.php
@@ -145,7 +145,7 @@ class Modal implements ModalInterface
         $tpl = $this->twig->loadTemplate('util/module/modal.tpl.html');
         $html = $tpl->render(array(
             'modal_id' => $this->modal_id,
-            'modal_title' => !empty($this->title) ? $this->title : psm_get_lang('system', 'title'),
+            'modal_title' => !empty($this->title) ? $this->title : psm_get_conf('site_title', psm_get_lang('system', 'title')),
             'modal_body' => $message,
             'has_cancel' => $has_cancel,
             'label_cancel' => psm_get_lang('system', 'cancel'),
diff --git a/src/psm/Util/Server/Updater/StatusNotifier.php b/src/psm/Util/Server/Updater/StatusNotifier.php
index d1db8ae7..080f0fbc 100644
--- a/src/psm/Util/Server/Updater/StatusNotifier.php
+++ b/src/psm/Util/Server/Updater/StatusNotifier.php
@@ -461,7 +461,7 @@ class StatusNotifier
         $pushover->setTitle($title);
         $pushover->setMessage(str_replace('<br/>', "\n", $message));
         $pushover->setUrl(psm_build_url());
-        $pushover->setUrlTitle(psm_get_lang('system', 'title'));
+        $pushover->setUrlTitle(psm_get_conf('site_title', psm_get_lang('system', 'title')));
 
         // Log
         if (psm_get_conf('log_pushover')) {
diff --git a/src/templates/default/module/config/config.tpl.html b/src/templates/default/module/config/config.tpl.html
index 3f7064e5..79b73c6c 100644
--- a/src/templates/default/module/config/config.tpl.html
+++ b/src/templates/default/module/config/config.tpl.html
@@ -41,6 +41,8 @@
                 <legend>{{ label_general }}</legend>
                 <!-- Update check -->
                 {{ macro.input_checkbox("show_update", "show_update[]", label_show_update, show_update_checked) }}
+                <!-- Site title -->
+                {{ macro.input_field("text", "site_title", null, "site_title", label_site_title, site_title, label_site_title, "255", null, null, null, null, true) }}
                 <!-- Language -->
                 {{ macro.input_select("language", "language", label_language, languages, language_current) }}
                 <!-- Auto refresh -->