diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/SAML.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/SAML.pm
index 74dd6def5..062ae2655 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/SAML.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/SAML.pm
@@ -462,6 +462,7 @@ sub checkMessage {
 
                 # Response in body part
                 $response = $req->param('SAMLResponse');
+                $response =~ s/ /+/g;
                 $self->logger->debug("HTTP-POST: SAML Response $response");
 
             }
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm
index e7642cb65..50c70fe55 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm
@@ -584,7 +584,8 @@ sub setHiddenFormValue {
     # Store value
     if ( defined $val or !( $val & ~$val ) ) {
         $key = $prefix . $key;
-        $val =~ s/\+/%2B/g;
+
+        #$val =~ s/\+/%2B/g;
         $req->{portalHiddenFormValues}->{$key} = $val;
         $self->logger->debug("Store $val in hidden key $key");
     }