Index: lams_common/src/java/org/lamsfoundation/lams/etherpad/service/EtherpadService.java
===================================================================
diff -u -r024f71c24280149ce16489cd0bca12fa127b17c9 -rdd66f49ea651e9bee0b6876bb71aa950ce65f2d8
--- lams_common/src/java/org/lamsfoundation/lams/etherpad/service/EtherpadService.java	(.../EtherpadService.java)	(revision 024f71c24280149ce16489cd0bca12fa127b17c9)
+++ lams_common/src/java/org/lamsfoundation/lams/etherpad/service/EtherpadService.java	(.../EtherpadService.java)	(revision dd66f49ea651e9bee0b6876bb71aa950ce65f2d8)
@@ -101,7 +101,9 @@
 	String topLevelDomain = m.matches() ? "." + m.group(1) : uri.getHost();
 
 	Cookie etherpadSessionCookie = new Cookie("sessionID", etherpadSessionIds);
-	etherpadSessionCookie.setDomain(topLevelDomain);
+	if (!topLevelDomain.equals("localhost")) {
+	    etherpadSessionCookie.setDomain(topLevelDomain);
+	}
 	// A negative value means that the cookie is not stored persistently and will be deleted when the Web browser
 	// exits. A zero value causes the cookie to be deleted.
 	etherpadSessionCookie.setMaxAge(-1);