diff --git a/lib/SP/Http/Request.php b/lib/SP/Http/Request.php
index 0be280c44..2ce3eea86 100644
--- a/lib/SP/Http/Request.php
+++ b/lib/SP/Http/Request.php
@@ -171,8 +171,10 @@ public function getForwardedFor()
         $forwarded = $this->headers->get('HTTP_FORWARDED');
 
         if ($forwarded !== null &&
-            preg_match_all('/(?:for=([\w.:]+))|(?:for="\[([\w.:]+)\]")/i',
-                $forwarded, $matches)
+            preg_match_all(
+                '/(?:for=([\w.:]+))|(?:for="\[([\w.:]+)\]")/i',
+                $forwarded,
+                $matches)
         ) {
             return array_filter(array_merge($matches[1], $matches[2]), function ($value) {
                 return !empty($value);
@@ -180,7 +182,7 @@ public function getForwardedFor()
         }
 
         // eg: X-Forwarded-For: 192.0.2.43, 2001:db8:cafe::17
-        $xForwarded = $this->headers->exists('HTTP_X_FORWARDED_FOR');
+        $xForwarded = $this->headers->get('HTTP_X_FORWARDED_FOR');
 
         if ($xForwarded !== null) {
             $matches = preg_split('/(?<=[\w])+,\s?/i',
diff --git a/lib/SP/Services/Install/Installer.php b/lib/SP/Services/Install/Installer.php
index f0fd627df..4384b4a83 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, 1];
+    const VERSION = [3, 2, 2];
     const VERSION_TEXT = '3.2';
-    const BUILD = 21011601;
+    const BUILD = 21031301;
 
     /**
      * @var DatabaseSetupInterface
diff --git a/public/js/app-util.js b/public/js/app-util.js
index 826458d48..da08c7ac4 100644
--- a/public/js/app-util.js
+++ b/public/js/app-util.js
@@ -444,7 +444,9 @@ sysPass.Util = function (log) {
                     }
                 }
 
-                if (password.config.complexity.uppercase) {
+                if (password.config.complexity.chars
+                    && password.config.complexity.uppercase
+                ) {
                     const chars = password.config.charset.char.toUpperCase();
                     const res = inPassArray.some(
                         function (el) {
diff --git a/public/js/app-util.min.js b/public/js/app-util.min.js
index 87ecd2602..eb29418db 100644
--- a/public/js/app-util.min.js
+++ b/public/js/app-util.min.js
@@ -7,7 +7,7 @@ $jscomp.iteratorPrototype=function(a){$jscomp.initSymbolIterator();a={next:a};a[
 $jscomp.polyfill("Array.prototype.keys",function(a){return a?a:function(){return $jscomp.iteratorFromArray(this,function(a){return a})}},"es6","es3");
 sysPass.Util=function(a){var d={config:{passLength:0,minPasswordLength:12,complexity:{chars:!0,numbers:!0,symbols:!0,uppercase:!0,numlength:12},charset:{special:"!\"\\\u00b7@|#$~%&/()=?'\u00bf\u00a1^*[]\u00b7;,_-{}<>",number:"1234567890",char:"abcdefghijklmnopqrstuvwxyz"}},random:function(b){a.info("password:random");var c="";this.config.complexity.symbols&&(c+=this.config.charset.special);this.config.complexity.numbers&&(c+=this.config.charset.number);this.config.complexity.chars&&(c+=this.config.charset.char,
 this.config.complexity.uppercase&&(c+=this.config.charset.char.toUpperCase()));var f=function(){for(var a="",b=0;b++<d.config.complexity.numlength;)a+=c.charAt(Math.floor(Math.random()*(c.length-1)));return a},m=function(b){a.info("password:random:checkComplexity");b=b.split("");if(d.config.complexity.symbols){var c=b.some(function(a){return 0<d.config.charset.special.indexOf(a)});if(!1===c)return c}if(d.config.complexity.numbers&&(c=b.some(function(a){return 0<d.config.charset.number.indexOf(a)}),
-!1===c)||d.config.complexity.chars&&(c=b.some(function(a){return 0<d.config.charset.char.indexOf(a)}),!1===c))return c;if(d.config.complexity.uppercase){var f=d.config.charset.char.toUpperCase();b=b.some(function(a){return 0<f.indexOf(a)});if(!1===b)return b}return!0},e="";do e=f();while(!m(e));this.config.passLength=e.length;"function"===typeof b&&b(e,zxcvbn(e))},output:function(b,c){a.info("password:outputResult");c=$("#password-level-"+c.attr("id"));var f=b.score;c.removeClass("weak good strong strongest");
+!1===c)||d.config.complexity.chars&&(c=b.some(function(a){return 0<d.config.charset.char.indexOf(a)}),!1===c))return c;if(d.config.complexity.chars&&d.config.complexity.uppercase){var f=d.config.charset.char.toUpperCase();b=b.some(function(a){return 0<f.indexOf(a)});if(!1===b)return b}return!0},e="";do e=f();while(!m(e));this.config.passLength=e.length;"function"===typeof b&&b(e,zxcvbn(e))},output:function(b,c){a.info("password:outputResult");c=$("#password-level-"+c.attr("id"));var f=b.score;c.removeClass("weak good strong strongest");
 0===this.config.passLength?c.attr("data-level-msg",""):this.config.passLength<this.config.minPasswordLength?c.attr("data-level-msg",sysPassApp.config.LANG[11]).addClass("weak"):0===f?c.attr("data-level-msg",sysPassApp.config.LANG[9]+" - "+b.feedback.warning).addClass("weak"):1===f||2===f?c.attr("data-level-msg",sysPassApp.config.LANG[8]+" - "+b.feedback.warning).addClass("good"):3===f?c.attr("data-level-msg",sysPassApp.config.LANG[7]).addClass("strong"):4===f&&c.attr("data-level-msg",sysPassApp.config.LANG[10]).addClass("strongest")},
 checkLevel:function(b){a.info("password:checkPassLevel");this.config.passLength=b.val().length;d.output(zxcvbn(b.val()),b)}},e={state:{lastHash:""},send:function(b,c,f){a.info("sendNotification");if(!("Notification"in window))a.info("Notifications not supported");else if(f!==e.state.lastHash){var d=function(){a.info("sendNotification:fireMessage");e.state.lastHash=f;var d={};void 0!==c&&(d.body=c);new Notification(b,d)};"granted"===Notification.permission?d():"denied"!==Notification.permission&&Notification.requestPermission().then(function(b){"granted"===
 b?d():a.info("Notifications disabled")})}}};return{decodeEntities:function(a){return $("<textarea />").html(a).text()},resizeImage:function(a){var b=.9*$(window).width(),d=.9*$(window).height(),e={width:a.width(),height:a.height()},g={calc:0,main:0,secondary:0,factor:.9,rel:e.width/e.height},h=function(a){a.main>a.secondary?a.calc=a.main/a.rel:a.main<a.secondary&&(a.calc=a.main*a.rel);a.calc>a.secondary&&(a.main*=a.factor,h(a));return a},k=function(){g.main=b;g.secondary=d;var c=h(g);a.css({width:c.main,