From d49219ceecf746ba96f848cdf54335741458c038 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 1 Mar 2018 11:17:03 -0500
Subject: [PATCH] Save original username in cookie

Fixes #4363
---
 NEWS                     | 1 +
 UI/MainUI/SOGoRootPage.m | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 3f3d417c0..0eeeaab45 100644
--- a/NEWS
+++ b/NEWS
@@ -54,6 +54,7 @@ Bug fixes
  - [web] fixed file uploader URL in mail editor
  - [web] fixed decoding of spaces in URL-encoded parameters (+)
  - [web] fixed scrolling of message with Firefox (#4008, #4282, #4398)
+ - [web] save original username in cookie when remembering login (#4363)
  - [eas] hebrew folders encoding problem using EAS (#4240)
  - [eas] avoid sync requests for shared folders every second (#4275)
  - [eas] we skip the organizer from the attendees list (#4402)
diff --git a/UI/MainUI/SOGoRootPage.m b/UI/MainUI/SOGoRootPage.m
index 668383a09..4b33cfe50 100644
--- a/UI/MainUI/SOGoRootPage.m
+++ b/UI/MainUI/SOGoRootPage.m
@@ -272,7 +272,7 @@
     }
 
   if (rememberLogin)
-    [response addCookie: [self _cookieWithUsername: username]];
+    [response addCookie: [self _cookieWithUsername: [params objectForKey: @"userName"]]];
   else
     [response addCookie: [self _cookieWithUsername: nil]];