Index: lams_common/src/java/org/lamsfoundation/lams/etherpad/service/EtherpadService.java
===================================================================
diff -u -rc364f48d3f1a5d354f6fce9a3063a8f6963e7a62 -rffc3401f0b164d7bc2aff097a633e22bef241874
--- lams_common/src/java/org/lamsfoundation/lams/etherpad/service/EtherpadService.java	(.../EtherpadService.java)	(revision c364f48d3f1a5d354f6fce9a3063a8f6963e7a62)
+++ lams_common/src/java/org/lamsfoundation/lams/etherpad/service/EtherpadService.java	(.../EtherpadService.java)	(revision ffc3401f0b164d7bc2aff097a633e22bef241874)
@@ -102,11 +102,13 @@
 
 	// cookie needs to be constructed manually so we can set SameSite=None
 	StringBuilder cookieHeaderValue = new StringBuilder("sessionID=\"").append(etherpadSessionIds)
-		.append("\"; Version 1; Path=/; Discard; Secure; SameSite=None;");
+		.append("\"; Path=/; ");
 
 	if (!topLevelDomain.equals("localhost")) {
-	    cookieHeaderValue.append("Domain=").append(topLevelDomain);
+	    cookieHeaderValue.append("Domain=").append(topLevelDomain).append("; ");
 	}
+	
+	cookieHeaderValue.append("Secure; SameSite=None");
 
 	response.setHeader("Set-Cookie", cookieHeaderValue.toString());
     }