diff --git a/app/modules/web/themes/material-blue/views/account/account-editpass.inc b/app/modules/web/themes/material-blue/views/account/account-editpass.inc
index c0fe386b1..2635e42f5 100644
--- a/app/modules/web/themes/material-blue/views/account/account-editpass.inc
+++ b/app/modules/web/themes/material-blue/views/account/account-editpass.inc
@@ -63,7 +63,7 @@ $accountAcl = $_getvar('accountAcl');
                     <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
                         <input id="url" name="url" type="text"
                                class="mdl-textfield__input mdl-color-text--indigo-400"
-                               value="<?php echo $accountData->getUrl(); ?>"
+                               value="<?php echo htmlspecialchars($accountData->getUrl(), ENT_QUOTES); ?>"
                                readonly>
                         <label class="mdl-textfield__label"
                                for="url"><?php echo __('URL / IP'); ?></label>
diff --git a/app/modules/web/themes/material-blue/views/account/account-history.inc b/app/modules/web/themes/material-blue/views/account/account-history.inc
index e1f6014c1..7082ca354 100644
--- a/app/modules/web/themes/material-blue/views/account/account-history.inc
+++ b/app/modules/web/themes/material-blue/views/account/account-history.inc
@@ -110,7 +110,7 @@ $accountAcl = $_getvar('accountAcl');
                                 <input id="url" name="url" type="text"
                                        class="mdl-textfield__input mdl-color-text--indigo-400"
                                        maxlength="255" tabindex="4"
-                                       value="<?php echo $accountData->getUrl(); ?>"
+                                       value="<?php echo htmlspecialchars($accountData->getUrl(), ENT_QUOTES); ?>"
                                        readonly>
                                 <label class="mdl-textfield__label"
                                        for="name"><?php echo __('Access URL or IP'); ?></label>
diff --git a/app/modules/web/themes/material-blue/views/account/account.inc b/app/modules/web/themes/material-blue/views/account/account.inc
index f3d69b103..5ec50390f 100644
--- a/app/modules/web/themes/material-blue/views/account/account.inc
+++ b/app/modules/web/themes/material-blue/views/account/account.inc
@@ -164,7 +164,7 @@ $showCustomFields = count($_getvar('customFields', 0)) > 0;
                                        class="mdl-textfield__input mdl-color-text--indigo-400"
                                        maxlength="255"
                                        value="<?php echo $gotData
-                                           ? $accountData->getUrl()
+                                           ? htmlspecialchars($accountData->getUrl(), ENT_QUOTES)
                                            : ''; ?>"
                                     <?php echo $_getvar('readonly'); ?>
                                 >
diff --git a/app/modules/web/themes/material-blue/views/account/search-rows.inc b/app/modules/web/themes/material-blue/views/account/search-rows.inc
index b1a598424..8b36c9786 100644
--- a/app/modules/web/themes/material-blue/views/account/search-rows.inc
+++ b/app/modules/web/themes/material-blue/views/account/search-rows.inc
@@ -102,13 +102,13 @@ $favoriteRouteOff = $_getvar('favoriteRouteOff');
                         <div class="field-url field-text label-field">
                             <div class="field-name"><?php echo __('URL / IP'); ?></div>
                             <?php if ($accountSearchItem->isUrlIslink()): ?>
-                                <a href="<?php echo $accountSearchData->getUrl(); ?>"
+                                <a href="<?php echo urlencode($accountSearchData->getUrl()); ?>"
                                    target="_blank"
-                                   title="<?php printf(__('Open link to: %s'), $accountSearchData->getUrl()); ?>">
-                                    <?php echo $accountSearchItem->getShortUrl(); ?>
+                                   title="<?php printf(__('Open link to: %s'), htmlspecialchars($accountSearchData->getUrl(), ENT_QUOTES)); ?>">
+                                    <?php echo htmlspecialchars($accountSearchItem->getShortUrl(), ENT_QUOTES); ?>
                                 </a>
                             <?php else: ?>
-                                <div class="field-text"><?php echo $accountSearchItem->getShortUrl(); ?></div>
+                                <div class="field-text"><?php echo htmlspecialchars($accountSearchItem->getShortUrl(), ENT_QUOTES); ?></div>
                             <?php endif; ?>
                         </div>
                     <?php else: ?>
diff --git a/app/modules/web/themes/material-blue/views/config/general-auth.inc b/app/modules/web/themes/material-blue/views/config/general-auth.inc
index a9c01e2ad..e2675bb6c 100644
--- a/app/modules/web/themes/material-blue/views/config/general-auth.inc
+++ b/app/modules/web/themes/material-blue/views/config/general-auth.inc
@@ -74,7 +74,7 @@ use SP\Mvc\View\Template;
                 <input id="authbasic_domain" name="authbasic_domain" type="text"
                        class="mdl-textfield__input mdl-color-text--indigo-400"
                        maxlength="128"
-                       value="<?php echo $configData->getAuthBasicDomain(); ?>">
+                       value="<?php echo htmlspecialchars($configData->getAuthBasicDomain(), ENT_QUOTES); ?>">
                 <label class="mdl-textfield__label"
                        for="authbasic_domain"><?php echo __('Domain name'); ?></label>
             </div>
diff --git a/app/modules/web/themes/material-blue/views/config/general-events.inc b/app/modules/web/themes/material-blue/views/config/general-events.inc
index 025172c18..472551d5e 100644
--- a/app/modules/web/themes/material-blue/views/config/general-events.inc
+++ b/app/modules/web/themes/material-blue/views/config/general-events.inc
@@ -83,7 +83,7 @@ use SP\Mvc\View\Template;
                 <input id="remotesyslog_server" name="remotesyslog_server"
                        type="text"
                        class="mdl-textfield__input mdl-color-text--indigo-400"
-                       value="<?php echo $configData->getSyslogServer(); ?>"/>
+                       value="<?php echo htmlspecialchars($configData->getSyslogServer(), ENT_QUOTES); ?>"/>
                 <label class="mdl-textfield__label"
                        for="remotesyslog_server"><?php echo __('Hostname or IP address'); ?></label>
             </div>
diff --git a/app/modules/web/themes/material-blue/views/config/general-proxy.inc b/app/modules/web/themes/material-blue/views/config/general-proxy.inc
index d8213754e..7acf1c85e 100644
--- a/app/modules/web/themes/material-blue/views/config/general-proxy.inc
+++ b/app/modules/web/themes/material-blue/views/config/general-proxy.inc
@@ -49,7 +49,7 @@ use SP\Mvc\View\Template;
                 <input id="proxy_server" name="proxy_server" type="text"
                        class="mdl-textfield__input mdl-color-text--indigo-400"
                        maxlength="128"
-                       value="<?php echo $configData->getProxyServer(); ?>">
+                       value="<?php echo htmlspecialchars($configData->getProxyServer(), ENT_QUOTES); ?>">
                 <label class="mdl-textfield__label"
                        for="proxy_server"><?php echo __('Proxy server'); ?></label>
             </div>
@@ -80,7 +80,7 @@ use SP\Mvc\View\Template;
                 <input id="proxy_user" name="proxy_user" type="text"
                        class="mdl-textfield__input mdl-color-text--indigo-400"
                        maxlength="128"
-                       value="<?php echo $configData->getProxyUser(); ?>">
+                       value="<?php echo htmlspecialchars($configData->getProxyUser(), ENT_QUOTES); ?>">
                 <label class="mdl-textfield__label"
                        for="proxy_user"><?php echo __('Proxy server user'); ?></label>
             </div>
diff --git a/app/modules/web/themes/material-blue/views/config/general-site.inc b/app/modules/web/themes/material-blue/views/config/general-site.inc
index c35b9565b..be30025df 100644
--- a/app/modules/web/themes/material-blue/views/config/general-site.inc
+++ b/app/modules/web/themes/material-blue/views/config/general-site.inc
@@ -118,7 +118,7 @@ use SP\Mvc\View\Template;
                 <input id="app_url" name="app_url" type="url"
                        pattern="^https?://.*"
                        class="mdl-textfield__input mdl-color-text--indigo-400"
-                       value="<?php echo $configData->getApplicationUrl(); ?>"/>
+                       value="<?php echo htmlspecialchars($configData->getApplicationUrl(), ENT_QUOTES); ?>"/>
                 <label class="mdl-textfield__label"
                        for="app_url"><?php echo __('Application URL'); ?></label>
             </div>
diff --git a/app/modules/web/themes/material-blue/views/config/ldap.inc b/app/modules/web/themes/material-blue/views/config/ldap.inc
index ed31b130d..4e6708e83 100644
--- a/app/modules/web/themes/material-blue/views/config/ldap.inc
+++ b/app/modules/web/themes/material-blue/views/config/ldap.inc
@@ -124,7 +124,7 @@ use SP\Mvc\View\Template;
                     <input id="ldap_server" name="ldap_server" type="text"
                            class="mdl-textfield__input mdl-color-text--indigo-400"
                            maxlength="128"
-                           value="<?php echo $configData->getLdapServer(); ?>"/>
+                           value="<?php echo htmlspecialchars($configData->getLdapServer(), ENT_QUOTES); ?>"/>
                     <label class="mdl-textfield__label"
                            for="ldap_server"><?php echo __('Server'); ?></label>
                 </div>
@@ -156,7 +156,7 @@ use SP\Mvc\View\Template;
                     <input id="ldap_binduser" name="ldap_binduser" type="text"
                            class="mdl-textfield__input mdl-color-text--indigo-400"
                            maxlength="128"
-                           value="<?php echo $configData->getLdapBindUser(); ?>"/>
+                           value="<?php echo htmlspecialchars($configData->getLdapBindUser(), ENT_QUOTES); ?>"/>
                     <label class="mdl-textfield__label"
                            for="ldap_binduser"><?php echo __('User'); ?></label>
                 </div>
@@ -223,7 +223,7 @@ use SP\Mvc\View\Template;
                     <input id="ldap_base" name="ldap_base" type="text"
                            class="mdl-textfield__input mdl-color-text--indigo-400"
                            maxlength="128"
-                           value="<?php echo $configData->getLdapBase(); ?>"/>
+                           value="<?php echo htmlspecialchars($configData->getLdapBase(), ENT_QUOTES); ?>"/>
                     <label class="mdl-textfield__label"
                            for="ldap_base"><?php echo __('Search base'); ?></label>
                 </div>
@@ -259,7 +259,7 @@ use SP\Mvc\View\Template;
                     <input id="ldap_group" name="ldap_group" type="text"
                            class="mdl-textfield__input mdl-color-text--indigo-400"
                            maxlength="128"
-                           value="<?php echo $configData->getLdapGroup(); ?>"/>
+                           value="<?php echo htmlspecialchars($configData->getLdapGroup(), ENT_QUOTES); ?>"/>
                     <label class="mdl-textfield__label"
                            for="ldap_group"><?php echo __('Group'); ?></label>
                 </div>
diff --git a/app/modules/web/themes/material-blue/views/config/mail.inc b/app/modules/web/themes/material-blue/views/config/mail.inc
index 496abf3cc..800ff1594 100644
--- a/app/modules/web/themes/material-blue/views/config/mail.inc
+++ b/app/modules/web/themes/material-blue/views/config/mail.inc
@@ -73,7 +73,7 @@ use SP\Mvc\View\Template;
                     <input id="mail_server" name="mail_server" type="text"
                            class="mdl-textfield__input mdl-color-text--indigo-400"
                            maxlength="128"
-                           value="<?php echo $configData->getMailServer(); ?>"/>
+                           value="<?php echo htmlspecialchars($configData->getMailServer(), ENT_QUOTES); ?>"/>
                     <label class="mdl-textfield__label"
                            for="mail_server"><?php echo __('Server'); ?></label>
                 </div>
@@ -126,7 +126,7 @@ use SP\Mvc\View\Template;
                     <input id="mail_user" name="mail_user" type="text"
                            class="mdl-textfield__input mdl-color-text--indigo-400"
                            maxlength="50"
-                           value="<?php echo $configData->getMailUser(); ?>"/>
+                           value="<?php echo htmlspecialchars($configData->getMailUser(), ENT_QUOTES); ?>"/>
                     <label class="mdl-textfield__label"
                            for="mail_user"><?php echo __('User'); ?></label>
                 </div>
@@ -173,7 +173,7 @@ use SP\Mvc\View\Template;
                     <input id="mail_from" name="mail_from" type="email"
                            class="mdl-textfield__input mdl-color-text--indigo-400"
                            maxlength="128"
-                           value="<?php echo $configData->getMailFrom(); ?>"/>
+                           value="<?php echo htmlspecialchars($configData->getMailFrom(), ENT_QUOTES); ?>"/>
                     <label class="mdl-textfield__label"
                            for="mail_from"><?php echo __('Sender email address'); ?></label>
                 </div>
diff --git a/app/modules/web/themes/material-blue/views/config/wiki-dokuwiki.inc b/app/modules/web/themes/material-blue/views/config/wiki-dokuwiki.inc
index 077ce8a7c..538389899 100644
--- a/app/modules/web/themes/material-blue/views/config/wiki-dokuwiki.inc
+++ b/app/modules/web/themes/material-blue/views/config/wiki-dokuwiki.inc
@@ -87,7 +87,7 @@ use SP\Mvc\View\Template;
                     <input id="dokuwiki_url" name="dokuwiki_url" type="text"
                            class="mdl-textfield__input mdl-color-text--indigo-400"
                            maxlength="255"
-                           value="<?php echo $configData->getDokuwikiUrl(); ?>"/>
+                           value="<?php echo htmlspecialchars($configData->getDokuwikiUrl(), ENT_QUOTES); ?>"/>
                     <label class="mdl-textfield__label"
                            for="dokuwiki_url"><?php echo __('API URL'); ?></label>
                 </div>
@@ -118,7 +118,7 @@ use SP\Mvc\View\Template;
                            type="text"
                            class="mdl-textfield__input mdl-color-text--indigo-400"
                            maxlength="255"
-                           value="<?php echo $configData->getDokuwikiUrlBase(); ?>"/>
+                           value="<?php echo htmlspecialchars($configData->getDokuwikiUrlBase(), ENT_QUOTES); ?>"/>
                     <label class="mdl-textfield__label"
                            for="dokuwiki_urlbase"><?php echo __('Base URL'); ?></label>
                 </div>
@@ -141,7 +141,7 @@ use SP\Mvc\View\Template;
                     <input id="dokuwiki_user" name="dokuwiki_user" type="text"
                            class="mdl-textfield__input mdl-color-text--indigo-400"
                            maxlength="128"
-                           value="<?php echo $configData->getDokuwikiUser(); ?>"/>
+                           value="<?php echo htmlspecialchars($configData->getDokuwikiUser(), ENT_QUOTES); ?>"/>
                     <label class="mdl-textfield__label"
                            for="dokuwiki_user"><?php echo __('User'); ?></label>
                 </div>
diff --git a/app/modules/web/themes/material-blue/views/config/wiki.inc b/app/modules/web/themes/material-blue/views/config/wiki.inc
index 5e8f77c38..32bf93054 100644
--- a/app/modules/web/themes/material-blue/views/config/wiki.inc
+++ b/app/modules/web/themes/material-blue/views/config/wiki.inc
@@ -74,7 +74,7 @@ use SP\Mvc\View\Template;
                     <input id="wiki_searchurl" name="wiki_searchurl" type="text"
                            class="mdl-textfield__input mdl-color-text--indigo-400"
                            maxlength="255"
-                           value="<?php echo $configData->getWikiSearchurl(); ?>">
+                           value="<?php echo htmlspecialchars($configData->getWikiSearchurl(), ENT_QUOTES); ?>">
                     <label class="mdl-textfield__label"
                            for="wiki_searchurl"><?php echo __('Wiki search URL'); ?></label>
                 </div>
@@ -109,7 +109,7 @@ use SP\Mvc\View\Template;
                     <input id="wiki_pageurl" name="wiki_pageurl" type="text"
                            class="mdl-textfield__input mdl-color-text--indigo-400"
                            maxlength="255"
-                           value="<?php echo $configData->getWikiPageurl(); ?>">
+                           value="<?php echo htmlspecialchars($configData->getWikiPageurl(), ENT_QUOTES); ?>">
                     <label class="mdl-textfield__label"
                            for="wiki_pageurl"><?php echo __('Wiki page URL'); ?></label>
                 </div>
diff --git a/lib/SP/Services/Install/Installer.php b/lib/SP/Services/Install/Installer.php
index 98bf0ef5b..e413dd5ef 100644
--- a/lib/SP/Services/Install/Installer.php
+++ b/lib/SP/Services/Install/Installer.php
@@ -60,9 +60,9 @@ final class Installer extends Service
     /**
      * sysPass' version and build number
      */
-    const VERSION = [3, 2, 4];
+    const VERSION = [3, 2, 5];
     const VERSION_TEXT = '3.2';
-    const BUILD = 22052601;
+    const BUILD = 22060401;
 
     /**
      * @var DatabaseSetupInterface